Merge lp:~camptocamp/openobject-addons/7.0-fix-lp-1192195-RDE into lp:openobject-addons
- 7.0-fix-lp-1192195-RDE
- Merge into trunk
Proposed by
Romain Deheele - Camptocamp
| Status: | Rejected |
|---|---|
| Rejected by: | Martin Trigaux (OpenERP) |
| Proposed branch: | lp:~camptocamp/openobject-addons/7.0-fix-lp-1192195-RDE |
| Merge into: | lp:openobject-addons |
| Diff against target: |
62726 lines (+24589/-649) (has conflicts) 151 files modified
account/i18n/account.pot (+232/-0) account/i18n/ar.po (+241/-2) account/i18n/bg.po (+241/-2) account/i18n/br.po (+237/-2) account/i18n/bs.po (+241/-2) account/i18n/ca.po (+241/-2) account/i18n/cs.po (+240/-2) account/i18n/da.po (+238/-2) account/i18n/de.po (+246/-2) account/i18n/el.po (+238/-2) account/i18n/en_GB.po (+238/-2) account/i18n/en_US.po (+237/-2) account/i18n/es.po (+241/-2) account/i18n/es_AR.po (+241/-2) account/i18n/es_CL.po (+237/-2) account/i18n/es_CR.po (+241/-2) account/i18n/es_DO.po (+237/-2) account/i18n/es_EC.po (+238/-2) account/i18n/es_MX.po (+238/-2) account/i18n/es_PY.po (+237/-2) account/i18n/es_UY.po (+237/-2) account/i18n/es_VE.po (+237/-2) account/i18n/et.po (+241/-2) account/i18n/eu.po (+237/-2) account/i18n/fa.po (+237/-2) account/i18n/fa_AF.po (+236/-2) account/i18n/fi.po (+238/-2) account/i18n/fr.po (+244/-2) account/i18n/fr_BE.po (+237/-2) account/i18n/gl.po (+238/-2) account/i18n/gu.po (+238/-2) account/i18n/he.po (+237/-2) account/i18n/hi.po (+237/-2) account/i18n/hr.po (+239/-2) account/i18n/hu.po (+241/-2) account/i18n/id.po (+238/-2) account/i18n/it.po (+242/-2) account/i18n/ja.po (+238/-2) account/i18n/kab.po (+237/-2) account/i18n/kk.po (+237/-2) account/i18n/ko.po (+238/-2) account/i18n/lo.po (+237/-2) account/i18n/lt.po (+244/-2) account/i18n/lv.po (+238/-2) account/i18n/mk.po (+245/-2) account/i18n/mn.po (+244/-2) account/i18n/nb.po (+238/-2) account/i18n/nl.po (+245/-2) account/i18n/nl_BE.po (+241/-2) account/i18n/oc.po (+238/-2) account/i18n/pl.po (+241/-2) account/i18n/pt.po (+241/-2) account/i18n/pt_BR.po (+244/-2) account/i18n/ro.po (+414/-2) account/i18n/ru.po (+58/-0) account/i18n/si.po (+237/-2) account/i18n/sk.po (+236/-2) account/i18n/sl.po (+240/-2) account/i18n/sq.po (+238/-2) account/i18n/sr.po (+238/-2) account/i18n/sr@latin.po (+239/-2) account/i18n/sv.po (+241/-2) account/i18n/ta.po (+237/-2) account/i18n/te.po (+238/-2) account/i18n/th.po (+238/-2) account/i18n/tlh.po (+240/-2) account/i18n/tr.po (+617/-208) account/i18n/ug.po (+237/-2) account/i18n/uk.po (+240/-2) account/i18n/ur.po (+236/-2) account/i18n/vi.po (+239/-2) account/i18n/zh_CN.po (+117/-45) account/i18n/zh_HK.po (+237/-2) account/i18n/zh_TW.po (+241/-2) account/report/account_aged_partner_balance.py (+4/-3) account/report/account_aged_partner_balance.rml (+5/-2) account/report/account_balance.rml (+9/-3) account/report/account_general_journal.rml (+2/-2) account/report/account_general_ledger_landscape.rml (+5/-4) account/report/account_journal.py (+4/-3) account/report/account_journal.rml (+6/-4) account/report/account_partner_ledger.py (+4/-3) account/report/account_partner_ledger.rml (+3/-1) account/wizard/account_report_common.py (+1/-1) account_accountant/i18n/th.po (+15/-0) account_analytic_analysis/i18n/nl.po (+20/-0) account_analytic_analysis/i18n/tr.po (+46/-10) account_analytic_default/i18n/tr.po (+16/-2) account_asset/i18n/es.po (+37/-0) account_asset/i18n/th.po (+758/-0) account_budget/i18n/es.po (+66/-0) account_cancel/i18n/es.po (+19/-0) account_check_writing/i18n/tr.po (+18/-5) account_followup/i18n/es.po (+167/-0) account_payment/i18n/es.po (+39/-0) account_report_company/i18n/es.po (+64/-0) account_voucher/i18n/es.po (+96/-0) account_voucher/i18n/tr.po (+42/-8) analytic/i18n/es.po (+54/-0) analytic_contract_hr_expense/i18n/es.po (+38/-0) auth_signup/i18n/it.po (+144/-1) base_action_rule/i18n/es.po (+24/-0) base_calendar/i18n/es.po (+19/-0) base_gengo/i18n/es.po (+49/-0) base_import/i18n/fr.po (+45/-10) base_vat/i18n/es.po (+22/-0) contacts/i18n/th.po (+37/-0) crm/i18n/lt.po (+18/-0) crm/i18n/th.po (+17/-6) crm_claim/i18n/es.po (+34/-0) crm_helpdesk/i18n/es.po (+27/-0) email_template/i18n/tr.po (+36/-3) google_base_account/i18n/es.po (+19/-0) hr/i18n/th.po (+170/-99) hr_contract/i18n/es.po (+23/-1) hr_contract/i18n/th.po (+237/-0) hr_holidays/i18n/es.po (+51/-0) hr_payroll/i18n/es.po (+27/-0) hr_recruitment/i18n/es.po (+42/-0) hr_recruitment/i18n/fr.po (+97/-25) hr_timesheet/i18n/nl.po (+13/-1) hr_timesheet/i18n/th.po (+669/-0) hr_timesheet_invoice/i18n/es.po (+30/-0) hr_timesheet_sheet/i18n/th.po (+1151/-0) idea/i18n/tr.po (+168/-0) l10n_th/i18n/th.po (+12/-2) lunch/i18n/es.po (+35/-0) mail/i18n/fr.po (+94/-1) mail/i18n/it.po (+12/-1) mail/i18n/tr.po (+249/-12) marketing_campaign/i18n/es.po (+32/-0) membership/i18n/es.po (+30/-0) mrp/i18n/es.po (+26/-4) mrp_repair/i18n/es.po (+30/-0) note/i18n/es.po (+19/-0) pad/i18n/es.po (+19/-0) plugin/i18n/es.po (+38/-0) portal_sale/i18n/es.po (+19/-0) procurement/i18n/es.po (+87/-6) product/i18n/es.po (+98/-1) project_gtd/i18n/es.po (+22/-0) project_gtd/i18n/lt.po (+18/-0) project_long_term/i18n/es.po (+17/-0) project_mrp/project_mrp_view.xml (+2/-2) purchase/i18n/fr.po (+174/-0) purchase/i18n/th.po (+29/-10) purchase/i18n/tr.po (+233/-15) share/i18n/lt.po (+619/-0) stock/report/picking.rml (+3/-3) stock/stock_view.xml (+2/-2) web_shortcuts/i18n/th.po (+25/-0) Text conflict in account/i18n/account.pot Text conflict in account/i18n/ar.po Text conflict in account/i18n/bg.po Text conflict in account/i18n/br.po Text conflict in account/i18n/bs.po Text conflict in account/i18n/ca.po Text conflict in account/i18n/cs.po Text conflict in account/i18n/da.po Text conflict in account/i18n/de.po Text conflict in account/i18n/el.po Text conflict in account/i18n/en_GB.po Text conflict in account/i18n/en_US.po Text conflict in account/i18n/es.po Text conflict in account/i18n/es_AR.po Text conflict in account/i18n/es_CL.po Text conflict in account/i18n/es_CR.po Text conflict in account/i18n/es_DO.po Text conflict in account/i18n/es_EC.po Text conflict in account/i18n/es_MX.po Text conflict in account/i18n/es_PY.po Text conflict in account/i18n/es_UY.po Text conflict in account/i18n/es_VE.po Text conflict in account/i18n/et.po Text conflict in account/i18n/eu.po Text conflict in account/i18n/fa.po Text conflict in account/i18n/fa_AF.po Text conflict in account/i18n/fi.po Text conflict in account/i18n/fr.po Text conflict in account/i18n/fr_BE.po Text conflict in account/i18n/gl.po Text conflict in account/i18n/gu.po Text conflict in account/i18n/he.po Text conflict in account/i18n/hi.po Text conflict in account/i18n/hr.po Text conflict in account/i18n/hu.po Text conflict in account/i18n/id.po Text conflict in account/i18n/it.po Text conflict in account/i18n/ja.po Text conflict in account/i18n/kab.po Text conflict in account/i18n/kk.po Text conflict in account/i18n/ko.po Text conflict in account/i18n/lo.po Text conflict in account/i18n/lt.po Text conflict in account/i18n/lv.po Text conflict in account/i18n/mk.po Text conflict in account/i18n/mn.po Text conflict in account/i18n/nb.po Text conflict in account/i18n/nl.po Text conflict in account/i18n/nl_BE.po Text conflict in account/i18n/oc.po Text conflict in account/i18n/pl.po Text conflict in account/i18n/pt.po Text conflict in account/i18n/pt_BR.po Text conflict in account/i18n/ro.po Text conflict in account/i18n/ru.po Text conflict in account/i18n/si.po Text conflict in account/i18n/sk.po Text conflict in account/i18n/sl.po Text conflict in account/i18n/sq.po Text conflict in account/i18n/sr.po Text conflict in account/i18n/sr@latin.po Text conflict in account/i18n/sv.po Text conflict in account/i18n/ta.po Text conflict in account/i18n/te.po Text conflict in account/i18n/th.po Text conflict in account/i18n/tlh.po Text conflict in account/i18n/tr.po Text conflict in account/i18n/ug.po Text conflict in account/i18n/uk.po Text conflict in account/i18n/ur.po Text conflict in account/i18n/vi.po Text conflict in account/i18n/zh_CN.po Text conflict in account/i18n/zh_HK.po Text conflict in account/i18n/zh_TW.po Text conflict in account_accountant/i18n/th.po Text conflict in account_analytic_analysis/i18n/nl.po Text conflict in account_analytic_analysis/i18n/tr.po Text conflict in account_analytic_default/i18n/tr.po Text conflict in account_asset/i18n/es.po Conflict adding file account_asset/i18n/th.po. Moved existing file to account_asset/i18n/th.po.moved. Text conflict in account_budget/i18n/es.po Text conflict in account_cancel/i18n/es.po Text conflict in account_check_writing/i18n/tr.po Text conflict in account_followup/i18n/es.po Text conflict in account_payment/i18n/es.po Conflict adding files to account_report_company. Created directory. Conflict because account_report_company is not versioned, but has versioned children. Versioned directory. Conflict adding files to account_report_company/i18n. Created directory. Conflict because account_report_company/i18n is not versioned, but has versioned children. Versioned directory. Text conflict in account_voucher/i18n/es.po Text conflict in account_voucher/i18n/tr.po Text conflict in analytic/i18n/es.po Text conflict in analytic_contract_hr_expense/i18n/es.po Text conflict in auth_signup/i18n/it.po Text conflict in base_action_rule/i18n/es.po Text conflict in base_calendar/i18n/es.po Text conflict in base_gengo/i18n/es.po Text conflict in base_import/i18n/fr.po Text conflict in base_vat/i18n/es.po Conflict adding file contacts/i18n/th.po. Moved existing file to contacts/i18n/th.po.moved. Text conflict in crm/i18n/lt.po Text conflict in crm/i18n/th.po Text conflict in crm_claim/i18n/es.po Text conflict in crm_helpdesk/i18n/es.po Text conflict in email_template/i18n/tr.po Text conflict in google_base_account/i18n/es.po Text conflict in hr/i18n/th.po Text conflict in hr_contract/i18n/es.po Conflict adding file hr_contract/i18n/th.po. Moved existing file to hr_contract/i18n/th.po.moved. Text conflict in hr_holidays/i18n/es.po Text conflict in hr_payroll/i18n/es.po Text conflict in hr_recruitment/i18n/es.po Text conflict in hr_recruitment/i18n/fr.po Text conflict in hr_timesheet/i18n/nl.po Conflict adding file hr_timesheet/i18n/th.po. Moved existing file to hr_timesheet/i18n/th.po.moved. Text conflict in hr_timesheet_invoice/i18n/es.po Conflict adding file hr_timesheet_sheet/i18n/th.po. Moved existing file to hr_timesheet_sheet/i18n/th.po.moved. Text conflict in idea/i18n/tr.po Text conflict in l10n_th/i18n/th.po Text conflict in lunch/i18n/es.po Text conflict in mail/i18n/fr.po Text conflict in mail/i18n/it.po Text conflict in mail/i18n/tr.po Text conflict in marketing_campaign/i18n/es.po Text conflict in membership/i18n/es.po Text conflict in mrp/i18n/es.po Text conflict in mrp_repair/i18n/es.po Text conflict in note/i18n/es.po Text conflict in pad/i18n/es.po Text conflict in plugin/i18n/es.po Text conflict in portal_sale/i18n/es.po Text conflict in procurement/i18n/es.po Text conflict in product/i18n/es.po Text conflict in project_gtd/i18n/es.po Text conflict in project_gtd/i18n/lt.po Text conflict in project_long_term/i18n/es.po Text conflict in purchase/i18n/fr.po Text conflict in purchase/i18n/th.po Text conflict in purchase/i18n/tr.po Conflict adding file share/i18n/lt.po. Moved existing file to share/i18n/lt.po.moved. Conflict adding file web_shortcuts/i18n/th.po. Moved existing file to web_shortcuts/i18n/th.po.moved. |
| To merge this branch: | bzr merge lp:~camptocamp/openobject-addons/7.0-fix-lp-1192195-RDE |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| afayolle | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
This branch fixes bug #1192195.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'account/i18n/account.pot' | |||
| 2 | --- account/i18n/account.pot 2013-06-13 18:15:03 +0000 | |||
| 3 | +++ account/i18n/account.pot 2013-06-19 09:20:00 +0000 | |||
| 4 | @@ -6,8 +6,13 @@ | |||
| 5 | 6 | msgstr "" | 6 | msgstr "" |
| 6 | 7 | "Project-Id-Version: OpenERP Server 7.0alpha\n" | 7 | "Project-Id-Version: OpenERP Server 7.0alpha\n" |
| 7 | 8 | "Report-Msgid-Bugs-To: \n" | 8 | "Report-Msgid-Bugs-To: \n" |
| 8 | 9 | <<<<<<< TREE | ||
| 9 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
| 10 | 10 | "PO-Revision-Date: 2012-12-21 17:04+0000\n" | 11 | "PO-Revision-Date: 2012-12-21 17:04+0000\n" |
| 11 | 12 | ======= | ||
| 12 | 13 | "POT-Creation-Date: 2013-06-14 22:29+0000\n" | ||
| 13 | 14 | "PO-Revision-Date: 2013-06-14 22:29+0000\n" | ||
| 14 | 15 | >>>>>>> MERGE-SOURCE | ||
| 15 | 11 | "Last-Translator: <>\n" | 16 | "Last-Translator: <>\n" |
| 16 | 12 | "Language-Team: \n" | 17 | "Language-Team: \n" |
| 17 | 13 | "MIME-Version: 1.0\n" | 18 | "MIME-Version: 1.0\n" |
| 18 | @@ -120,11 +125,19 @@ | |||
| 19 | 120 | #: code:addons/account/account.py:641 | 125 | #: code:addons/account/account.py:641 |
| 20 | 121 | #: code:addons/account/account.py:686 | 126 | #: code:addons/account/account.py:686 |
| 21 | 122 | #: code:addons/account/account.py:781 | 127 | #: code:addons/account/account.py:781 |
| 22 | 128 | <<<<<<< TREE | ||
| 23 | 123 | #: code:addons/account/account.py:1049 | 129 | #: code:addons/account/account.py:1049 |
| 24 | 124 | #: code:addons/account/account_invoice.py:792 | 130 | #: code:addons/account/account_invoice.py:792 |
| 25 | 125 | #: code:addons/account/account_invoice.py:795 | 131 | #: code:addons/account/account_invoice.py:795 |
| 26 | 126 | #: code:addons/account/account_invoice.py:798 | 132 | #: code:addons/account/account_invoice.py:798 |
| 27 | 127 | #: code:addons/account/account_invoice.py:1509 | 133 | #: code:addons/account/account_invoice.py:1509 |
| 28 | 134 | ======= | ||
| 29 | 135 | #: code:addons/account/account.py:1058 | ||
| 30 | 136 | #: code:addons/account/account_invoice.py:820 | ||
| 31 | 137 | #: code:addons/account/account_invoice.py:823 | ||
| 32 | 138 | #: code:addons/account/account_invoice.py:826 | ||
| 33 | 139 | #: code:addons/account/account_invoice.py:1545 | ||
| 34 | 140 | >>>>>>> MERGE-SOURCE | ||
| 35 | 128 | #: code:addons/account/account_move_line.py:98 | 141 | #: code:addons/account/account_move_line.py:98 |
| 36 | 129 | #: code:addons/account/account_move_line.py:774 | 142 | #: code:addons/account/account_move_line.py:774 |
| 37 | 130 | #: code:addons/account/account_move_line.py:783 | 143 | #: code:addons/account/account_move_line.py:783 |
| 38 | @@ -301,7 +314,11 @@ | |||
| 39 | 301 | msgstr "" | 314 | msgstr "" |
| 40 | 302 | 315 | ||
| 41 | 303 | #. module: account | 316 | #. module: account |
| 42 | 317 | <<<<<<< TREE | ||
| 43 | 304 | #: code:addons/account/account_invoice.py:73 | 318 | #: code:addons/account/account_invoice.py:73 |
| 44 | 319 | ======= | ||
| 45 | 320 | #: code:addons/account/account_invoice.py:77 | ||
| 46 | 321 | >>>>>>> MERGE-SOURCE | ||
| 47 | 305 | #, python-format | 322 | #, python-format |
| 48 | 306 | msgid "You must define an analytic journal of type '%s'!" | 323 | msgid "You must define an analytic journal of type '%s'!" |
| 49 | 307 | msgstr "" | 324 | msgstr "" |
| 50 | @@ -546,10 +563,21 @@ | |||
| 51 | 546 | msgstr "" | 563 | msgstr "" |
| 52 | 547 | 564 | ||
| 53 | 548 | #. module: account | 565 | #. module: account |
| 54 | 566 | <<<<<<< TREE | ||
| 55 | 549 | #. openerp-web | 567 | #. openerp-web |
| 56 | 550 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 | 568 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
| 57 | 551 | #, python-format | 569 | #, python-format |
| 58 | 552 | msgid "Nothing to reconcile" | 570 | msgid "Nothing to reconcile" |
| 59 | 571 | ======= | ||
| 60 | 572 | #: report:account.account.balance:0 | ||
| 61 | 573 | #: selection:account.balance.report,display_account:0 | ||
| 62 | 574 | #: selection:account.common.account.report,display_account:0 | ||
| 63 | 575 | #: report:account.general.ledger_landscape:0 | ||
| 64 | 576 | #: selection:account.report.general.ledger,display_account:0 | ||
| 65 | 577 | #: selection:account.tax,type_tax_use:0 | ||
| 66 | 578 | #: selection:account.tax.template,type_tax_use:0 | ||
| 67 | 579 | msgid "All" | ||
| 68 | 580 | >>>>>>> MERGE-SOURCE | ||
| 69 | 553 | msgstr "" | 581 | msgstr "" |
| 70 | 554 | 582 | ||
| 71 | 555 | #. module: account | 583 | #. module: account |
| 72 | @@ -673,7 +701,9 @@ | |||
| 73 | 673 | #: selection:account.common.partner.report,result_selection:0 | 701 | #: selection:account.common.partner.report,result_selection:0 |
| 74 | 674 | #: selection:account.partner.balance,result_selection:0 | 702 | #: selection:account.partner.balance,result_selection:0 |
| 75 | 675 | #: selection:account.partner.ledger,result_selection:0 | 703 | #: selection:account.partner.ledger,result_selection:0 |
| 76 | 704 | #: report:account.third_party_ledger:0 | ||
| 77 | 676 | #: code:addons/account/report/account_partner_balance.py:297 | 705 | #: code:addons/account/report/account_partner_balance.py:297 |
| 78 | 706 | #: code:addons/account/report/account_partner_ledger.py:272 | ||
| 79 | 677 | #, python-format | 707 | #, python-format |
| 80 | 678 | msgid "Receivable Accounts" | 708 | msgid "Receivable Accounts" |
| 81 | 679 | msgstr "" | 709 | msgstr "" |
| 82 | @@ -709,7 +739,11 @@ | |||
| 83 | 709 | msgstr "" | 739 | msgstr "" |
| 84 | 710 | 740 | ||
| 85 | 711 | #. module: account | 741 | #. module: account |
| 86 | 742 | <<<<<<< TREE | ||
| 87 | 712 | #: code:addons/account/account_invoice.py:1329 | 743 | #: code:addons/account/account_invoice.py:1329 |
| 88 | 744 | ======= | ||
| 89 | 745 | #: code:addons/account/account_invoice.py:1361 | ||
| 90 | 746 | >>>>>>> MERGE-SOURCE | ||
| 91 | 713 | #, python-format | 747 | #, python-format |
| 92 | 714 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." | 748 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
| 93 | 715 | msgstr "" | 749 | msgstr "" |
| 94 | @@ -775,7 +809,11 @@ | |||
| 95 | 775 | msgstr "" | 809 | msgstr "" |
| 96 | 776 | 810 | ||
| 97 | 777 | #. module: account | 811 | #. module: account |
| 98 | 812 | <<<<<<< TREE | ||
| 99 | 778 | #: code:addons/account/account_invoice.py:798 | 813 | #: code:addons/account/account_invoice.py:798 |
| 100 | 814 | ======= | ||
| 101 | 815 | #: code:addons/account/account_invoice.py:826 | ||
| 102 | 816 | >>>>>>> MERGE-SOURCE | ||
| 103 | 779 | #, python-format | 817 | #, python-format |
| 104 | 780 | msgid "Taxes are missing!\n" | 818 | msgid "Taxes are missing!\n" |
| 105 | 781 | "Click on compute button." | 819 | "Click on compute button." |
| 106 | @@ -946,7 +984,11 @@ | |||
| 107 | 946 | msgstr "" | 984 | msgstr "" |
| 108 | 947 | 985 | ||
| 109 | 948 | #. module: account | 986 | #. module: account |
| 110 | 987 | <<<<<<< TREE | ||
| 111 | 949 | #: code:addons/account/account_invoice.py:871 | 988 | #: code:addons/account/account_invoice.py:871 |
| 112 | 989 | ======= | ||
| 113 | 990 | #: code:addons/account/account_invoice.py:899 | ||
| 114 | 991 | >>>>>>> MERGE-SOURCE | ||
| 115 | 950 | #, python-format | 992 | #, python-format |
| 116 | 951 | msgid "Please define sequence on the journal related to this invoice." | 993 | msgid "Please define sequence on the journal related to this invoice." |
| 117 | 952 | msgstr "" | 994 | msgstr "" |
| 118 | @@ -1014,10 +1056,17 @@ | |||
| 119 | 1014 | msgstr "" | 1056 | msgstr "" |
| 120 | 1015 | 1057 | ||
| 121 | 1016 | #. module: account | 1058 | #. module: account |
| 122 | 1059 | <<<<<<< TREE | ||
| 123 | 1017 | #: code:addons/account/account.py:2298 | 1060 | #: code:addons/account/account.py:2298 |
| 124 | 1018 | #: code:addons/account/account_bank_statement.py:423 | 1061 | #: code:addons/account/account_bank_statement.py:423 |
| 125 | 1019 | #: code:addons/account/account_invoice.py:73 | 1062 | #: code:addons/account/account_invoice.py:73 |
| 126 | 1020 | #: code:addons/account/account_invoice.py:748 | 1063 | #: code:addons/account/account_invoice.py:748 |
| 127 | 1064 | ======= | ||
| 128 | 1065 | #: code:addons/account/account.py:2346 | ||
| 129 | 1066 | #: code:addons/account/account_bank_statement.py:424 | ||
| 130 | 1067 | #: code:addons/account/account_invoice.py:77 | ||
| 131 | 1068 | #: code:addons/account/account_invoice.py:775 | ||
| 132 | 1069 | >>>>>>> MERGE-SOURCE | ||
| 133 | 1021 | #: code:addons/account/account_move_line.py:195 | 1070 | #: code:addons/account/account_move_line.py:195 |
| 134 | 1022 | #, python-format | 1071 | #, python-format |
| 135 | 1023 | msgid "No Analytic Journal !" | 1072 | msgid "No Analytic Journal !" |
| 136 | @@ -1428,8 +1477,10 @@ | |||
| 137 | 1428 | msgstr "" | 1477 | msgstr "" |
| 138 | 1429 | 1478 | ||
| 139 | 1430 | #. module: account | 1479 | #. module: account |
| 140 | 1480 | #: report:account.account.balance:0 | ||
| 141 | 1431 | #: selection:account.balance.report,display_account:0 | 1481 | #: selection:account.balance.report,display_account:0 |
| 142 | 1432 | #: selection:account.common.account.report,display_account:0 | 1482 | #: selection:account.common.account.report,display_account:0 |
| 143 | 1483 | #: report:account.general.ledger_landscape:0 | ||
| 144 | 1433 | #: selection:account.partner.balance,display_partner:0 | 1484 | #: selection:account.partner.balance,display_partner:0 |
| 145 | 1434 | #: selection:account.report.general.ledger,display_account:0 | 1485 | #: selection:account.report.general.ledger,display_account:0 |
| 146 | 1435 | msgid "With balance is not equal to 0" | 1486 | msgid "With balance is not equal to 0" |
| 147 | @@ -1651,6 +1702,10 @@ | |||
| 148 | 1651 | #: view:account.invoice:0 | 1702 | #: view:account.invoice:0 |
| 149 | 1652 | #: view:account.invoice.report:0 | 1703 | #: view:account.invoice.report:0 |
| 150 | 1653 | #: field:account.move.line,invoice:0 | 1704 | #: field:account.move.line,invoice:0 |
| 151 | 1705 | <<<<<<< TREE | ||
| 152 | 1706 | ======= | ||
| 153 | 1707 | #: code:addons/account/account_invoice.py:1157 | ||
| 154 | 1708 | >>>>>>> MERGE-SOURCE | ||
| 155 | 1654 | #: model:ir.model,name:account.model_account_invoice | 1709 | #: model:ir.model,name:account.model_account_invoice |
| 156 | 1655 | #: model:res.request.link,name:account.req_link_invoice | 1710 | #: model:res.request.link,name:account.req_link_invoice |
| 157 | 1656 | msgid "Invoice" | 1711 | msgid "Invoice" |
| 158 | @@ -1880,11 +1935,20 @@ | |||
| 159 | 1880 | #: code:addons/account/account_bank_statement.py:418 | 1935 | #: code:addons/account/account_bank_statement.py:418 |
| 160 | 1881 | #: code:addons/account/account_cash_statement.py:256 | 1936 | #: code:addons/account/account_cash_statement.py:256 |
| 161 | 1882 | #: code:addons/account/account_cash_statement.py:300 | 1937 | #: code:addons/account/account_cash_statement.py:300 |
| 162 | 1938 | <<<<<<< TREE | ||
| 163 | 1883 | #: code:addons/account/account_invoice.py:871 | 1939 | #: code:addons/account/account_invoice.py:871 |
| 164 | 1884 | #: code:addons/account/account_invoice.py:905 | 1940 | #: code:addons/account/account_invoice.py:905 |
| 165 | 1885 | #: code:addons/account/account_invoice.py:1095 | 1941 | #: code:addons/account/account_invoice.py:1095 |
| 166 | 1886 | #: code:addons/account/account_move_line.py:578 | 1942 | #: code:addons/account/account_move_line.py:578 |
| 167 | 1887 | #: code:addons/account/account_move_line.py:831 | 1943 | #: code:addons/account/account_move_line.py:831 |
| 168 | 1944 | ======= | ||
| 169 | 1945 | #: code:addons/account/account_invoice.py:899 | ||
| 170 | 1946 | #: code:addons/account/account_invoice.py:933 | ||
| 171 | 1947 | #: code:addons/account/account_invoice.py:1124 | ||
| 172 | 1948 | #: code:addons/account/account_move_line.py:579 | ||
| 173 | 1949 | #: code:addons/account/account_move_line.py:828 | ||
| 174 | 1950 | #: code:addons/account/account_move_line.py:851 | ||
| 175 | 1951 | >>>>>>> MERGE-SOURCE | ||
| 176 | 1888 | #: code:addons/account/account_move_line.py:854 | 1952 | #: code:addons/account/account_move_line.py:854 |
| 177 | 1889 | #: code:addons/account/account_move_line.py:857 | 1953 | #: code:addons/account/account_move_line.py:857 |
| 178 | 1890 | #: code:addons/account/account_move_line.py:1122 | 1954 | #: code:addons/account/account_move_line.py:1122 |
| 179 | @@ -2107,7 +2171,9 @@ | |||
| 180 | 2107 | #: selection:account.common.partner.report,result_selection:0 | 2171 | #: selection:account.common.partner.report,result_selection:0 |
| 181 | 2108 | #: selection:account.partner.balance,result_selection:0 | 2172 | #: selection:account.partner.balance,result_selection:0 |
| 182 | 2109 | #: selection:account.partner.ledger,result_selection:0 | 2173 | #: selection:account.partner.ledger,result_selection:0 |
| 183 | 2174 | #: report:account.third_party_ledger:0 | ||
| 184 | 2110 | #: code:addons/account/report/account_partner_balance.py:299 | 2175 | #: code:addons/account/report/account_partner_balance.py:299 |
| 185 | 2176 | #: code:addons/account/report/account_partner_ledger.py:274 | ||
| 186 | 2111 | #, python-format | 2177 | #, python-format |
| 187 | 2112 | msgid "Payable Accounts" | 2178 | msgid "Payable Accounts" |
| 188 | 2113 | msgstr "" | 2179 | msgstr "" |
| 189 | @@ -2398,7 +2464,11 @@ | |||
| 190 | 2398 | msgstr "" | 2464 | msgstr "" |
| 191 | 2399 | 2465 | ||
| 192 | 2400 | #. module: account | 2466 | #. module: account |
| 193 | 2467 | <<<<<<< TREE | ||
| 194 | 2401 | #: code:addons/account/account_invoice.py:905 | 2468 | #: code:addons/account/account_invoice.py:905 |
| 195 | 2469 | ======= | ||
| 196 | 2470 | #: code:addons/account/account_invoice.py:933 | ||
| 197 | 2471 | >>>>>>> MERGE-SOURCE | ||
| 198 | 2402 | #, python-format | 2472 | #, python-format |
| 199 | 2403 | msgid "Cannot create the invoice.\n" | 2473 | msgid "Cannot create the invoice.\n" |
| 200 | 2404 | "The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'." | 2474 | "The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'." |
| 201 | @@ -2650,6 +2720,7 @@ | |||
| 202 | 2650 | msgstr "" | 2720 | msgstr "" |
| 203 | 2651 | 2721 | ||
| 204 | 2652 | #. module: account | 2722 | #. module: account |
| 205 | 2723 | <<<<<<< TREE | ||
| 206 | 2653 | #: code:addons/account/account.py:3493 | 2724 | #: code:addons/account/account.py:3493 |
| 207 | 2654 | #: code:addons/account/account_bank_statement.py:404 | 2725 | #: code:addons/account/account_bank_statement.py:404 |
| 208 | 2655 | #: code:addons/account/account_invoice.py:386 | 2726 | #: code:addons/account/account_invoice.py:386 |
| 209 | @@ -2659,6 +2730,16 @@ | |||
| 210 | 2659 | #: code:addons/account/account_invoice.py:609 | 2730 | #: code:addons/account/account_invoice.py:609 |
| 211 | 2660 | #: code:addons/account/account_invoice.py:631 | 2731 | #: code:addons/account/account_invoice.py:631 |
| 212 | 2661 | #: code:addons/account/account_move_line.py:535 | 2732 | #: code:addons/account/account_move_line.py:535 |
| 213 | 2733 | ======= | ||
| 214 | 2734 | #: code:addons/account/account.py:3541 | ||
| 215 | 2735 | #: code:addons/account/account_bank_statement.py:405 | ||
| 216 | 2736 | #: code:addons/account/account_invoice.py:507 | ||
| 217 | 2737 | #: code:addons/account/account_invoice.py:609 | ||
| 218 | 2738 | #: code:addons/account/account_invoice.py:624 | ||
| 219 | 2739 | #: code:addons/account/account_invoice.py:632 | ||
| 220 | 2740 | #: code:addons/account/account_invoice.py:657 | ||
| 221 | 2741 | #: code:addons/account/account_move_line.py:536 | ||
| 222 | 2742 | >>>>>>> MERGE-SOURCE | ||
| 223 | 2662 | #, python-format | 2743 | #, python-format |
| 224 | 2663 | msgid "Configuration Error!" | 2744 | msgid "Configuration Error!" |
| 225 | 2664 | msgstr "" | 2745 | msgstr "" |
| 226 | @@ -2871,8 +2952,13 @@ | |||
| 227 | 2871 | msgstr "" | 2952 | msgstr "" |
| 228 | 2872 | 2953 | ||
| 229 | 2873 | #. module: account | 2954 | #. module: account |
| 230 | 2955 | <<<<<<< TREE | ||
| 231 | 2874 | #: code:addons/account/account.py:2298 | 2956 | #: code:addons/account/account.py:2298 |
| 232 | 2875 | #: code:addons/account/account_invoice.py:748 | 2957 | #: code:addons/account/account_invoice.py:748 |
| 233 | 2958 | ======= | ||
| 234 | 2959 | #: code:addons/account/account.py:2346 | ||
| 235 | 2960 | #: code:addons/account/account_invoice.py:775 | ||
| 236 | 2961 | >>>>>>> MERGE-SOURCE | ||
| 237 | 2876 | #: code:addons/account/account_move_line.py:195 | 2962 | #: code:addons/account/account_move_line.py:195 |
| 238 | 2877 | #, python-format | 2963 | #, python-format |
| 239 | 2878 | msgid "You have to define an analytic journal on the '%s' journal!" | 2964 | msgid "You have to define an analytic journal on the '%s' journal!" |
| 240 | @@ -2929,6 +3015,11 @@ | |||
| 241 | 2929 | msgstr "" | 3015 | msgstr "" |
| 242 | 2930 | 3016 | ||
| 243 | 2931 | #. module: account | 3017 | #. module: account |
| 244 | 3018 | #: report:account.journal.period.print:0 | ||
| 245 | 3019 | msgid "Reference Number" | ||
| 246 | 3020 | msgstr "" | ||
| 247 | 3021 | |||
| 248 | 3022 | #. module: account | ||
| 249 | 2932 | #: selection:account.entries.report,month:0 | 3023 | #: selection:account.entries.report,month:0 |
| 250 | 2933 | #: selection:account.invoice.report,month:0 | 3024 | #: selection:account.invoice.report,month:0 |
| 251 | 2934 | #: selection:analytic.entries.report,month:0 | 3025 | #: selection:analytic.entries.report,month:0 |
| 252 | @@ -3021,7 +3112,11 @@ | |||
| 253 | 3021 | msgstr "" | 3112 | msgstr "" |
| 254 | 3022 | 3113 | ||
| 255 | 3023 | #. module: account | 3114 | #. module: account |
| 256 | 3115 | <<<<<<< TREE | ||
| 257 | 3024 | #: code:addons/account/account_invoice.py:795 | 3116 | #: code:addons/account/account_invoice.py:795 |
| 258 | 3117 | ======= | ||
| 259 | 3118 | #: code:addons/account/account_invoice.py:823 | ||
| 260 | 3119 | >>>>>>> MERGE-SOURCE | ||
| 261 | 3025 | #, python-format | 3120 | #, python-format |
| 262 | 3026 | msgid "Tax base different!\n" | 3121 | msgid "Tax base different!\n" |
| 263 | 3027 | "Click on compute to update the tax base." | 3122 | "Click on compute to update the tax base." |
| 264 | @@ -3170,8 +3265,13 @@ | |||
| 265 | 3170 | msgstr "" | 3265 | msgstr "" |
| 266 | 3171 | 3266 | ||
| 267 | 3172 | #. module: account | 3267 | #. module: account |
| 268 | 3268 | <<<<<<< TREE | ||
| 269 | 3173 | #: code:addons/account/account.py:3412 | 3269 | #: code:addons/account/account.py:3412 |
| 270 | 3174 | #: code:addons/account/account_bank.py:95 | 3270 | #: code:addons/account/account_bank.py:95 |
| 271 | 3271 | ======= | ||
| 272 | 3272 | #: code:addons/account/account.py:3460 | ||
| 273 | 3273 | #: code:addons/account/account_bank.py:94 | ||
| 274 | 3274 | >>>>>>> MERGE-SOURCE | ||
| 275 | 3175 | #, python-format | 3275 | #, python-format |
| 276 | 3176 | msgid "BNK" | 3276 | msgid "BNK" |
| 277 | 3177 | msgstr "" | 3277 | msgstr "" |
| 278 | @@ -3403,7 +3503,11 @@ | |||
| 279 | 3403 | msgstr "" | 3503 | msgstr "" |
| 280 | 3404 | 3504 | ||
| 281 | 3405 | #. module: account | 3505 | #. module: account |
| 282 | 3506 | <<<<<<< TREE | ||
| 283 | 3406 | #: code:addons/account/account_invoice.py:988 | 3507 | #: code:addons/account/account_invoice.py:988 |
| 284 | 3508 | ======= | ||
| 285 | 3509 | #: code:addons/account/account_invoice.py:1016 | ||
| 286 | 3510 | >>>>>>> MERGE-SOURCE | ||
| 287 | 3407 | #, python-format | 3511 | #, python-format |
| 288 | 3408 | msgid "You cannot create an invoice on a centralized journal. Uncheck the centralized counterpart box in the related journal from the configuration menu." | 3512 | msgid "You cannot create an invoice on a centralized journal. Uncheck the centralized counterpart box in the related journal from the configuration menu." |
| 289 | 3409 | msgstr "" | 3513 | msgstr "" |
| 290 | @@ -3415,7 +3519,11 @@ | |||
| 291 | 3415 | msgstr "" | 3519 | msgstr "" |
| 292 | 3416 | 3520 | ||
| 293 | 3417 | #. module: account | 3521 | #. module: account |
| 294 | 3522 | <<<<<<< TREE | ||
| 295 | 3418 | #: code:addons/account/account_invoice.py:1428 | 3523 | #: code:addons/account/account_invoice.py:1428 |
| 296 | 3524 | ======= | ||
| 297 | 3525 | #: code:addons/account/account_invoice.py:1465 | ||
| 298 | 3526 | >>>>>>> MERGE-SOURCE | ||
| 299 | 3419 | #, python-format | 3527 | #, python-format |
| 300 | 3420 | msgid "No Partner Defined !" | 3528 | msgid "No Partner Defined !" |
| 301 | 3421 | msgstr "" | 3529 | msgstr "" |
| 302 | @@ -3659,14 +3767,21 @@ | |||
| 303 | 3659 | msgstr "" | 3767 | msgstr "" |
| 304 | 3660 | 3768 | ||
| 305 | 3661 | #. module: account | 3769 | #. module: account |
| 306 | 3770 | <<<<<<< TREE | ||
| 307 | 3662 | #: report:account.invoice:0 | 3771 | #: report:account.invoice:0 |
| 308 | 3663 | msgid "VAT :" | 3772 | msgid "VAT :" |
| 309 | 3664 | msgstr "" | 3773 | msgstr "" |
| 310 | 3665 | 3774 | ||
| 311 | 3666 | #. module: account | 3775 | #. module: account |
| 312 | 3776 | ======= | ||
| 313 | 3777 | #: report:account.account.balance:0 | ||
| 314 | 3778 | >>>>>>> MERGE-SOURCE | ||
| 315 | 3667 | #: report:account.central.journal:0 | 3779 | #: report:account.central.journal:0 |
| 316 | 3668 | #: view:account.config.settings:0 | 3780 | #: view:account.config.settings:0 |
| 317 | 3781 | #: report:account.general.journal:0 | ||
| 318 | 3669 | #: report:account.general.ledger:0 | 3782 | #: report:account.general.ledger:0 |
| 319 | 3783 | #: report:account.general.ledger_landscape:0 | ||
| 320 | 3784 | #: report:account.journal.period.print:0 | ||
| 321 | 3670 | #: report:account.partner.balance:0 | 3785 | #: report:account.partner.balance:0 |
| 322 | 3671 | #: report:account.third_party_ledger:0 | 3786 | #: report:account.third_party_ledger:0 |
| 323 | 3672 | #: report:account.third_party_ledger_other:0 | 3787 | #: report:account.third_party_ledger_other:0 |
| 324 | @@ -4006,7 +4121,11 @@ | |||
| 325 | 4006 | msgstr "" | 4121 | msgstr "" |
| 326 | 4007 | 4122 | ||
| 327 | 4008 | #. module: account | 4123 | #. module: account |
| 328 | 4124 | <<<<<<< TREE | ||
| 329 | 4009 | #: code:addons/account/account_invoice.py:554 | 4125 | #: code:addons/account/account_invoice.py:554 |
| 330 | 4126 | ======= | ||
| 331 | 4127 | #: code:addons/account/account_invoice.py:573 | ||
| 332 | 4128 | >>>>>>> MERGE-SOURCE | ||
| 333 | 4010 | #: code:addons/account/wizard/account_invoice_refund.py:146 | 4129 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
| 334 | 4011 | #, python-format | 4130 | #, python-format |
| 335 | 4012 | msgid "Insufficient Data!" | 4131 | msgid "Insufficient Data!" |
| 336 | @@ -4253,8 +4372,13 @@ | |||
| 337 | 4253 | msgstr "" | 4372 | msgstr "" |
| 338 | 4254 | 4373 | ||
| 339 | 4255 | #. module: account | 4374 | #. module: account |
| 340 | 4375 | <<<<<<< TREE | ||
| 341 | 4256 | #: code:addons/account/account_invoice.py:587 | 4376 | #: code:addons/account/account_invoice.py:587 |
| 342 | 4257 | #: code:addons/account/account_invoice.py:602 | 4377 | #: code:addons/account/account_invoice.py:602 |
| 343 | 4378 | ======= | ||
| 344 | 4379 | #: code:addons/account/account_invoice.py:610 | ||
| 345 | 4380 | #: code:addons/account/account_invoice.py:625 | ||
| 346 | 4381 | >>>>>>> MERGE-SOURCE | ||
| 347 | 4258 | #, python-format | 4382 | #, python-format |
| 348 | 4259 | msgid "Cannot find a chart of account, you should create one from Settings\\Configuration\\Accounting menu." | 4383 | msgid "Cannot find a chart of account, you should create one from Settings\\Configuration\\Accounting menu." |
| 349 | 4260 | msgstr "" | 4384 | msgstr "" |
| 350 | @@ -4517,7 +4641,11 @@ | |||
| 351 | 4517 | msgstr "" | 4641 | msgstr "" |
| 352 | 4518 | 4642 | ||
| 353 | 4519 | #. module: account | 4643 | #. module: account |
| 354 | 4644 | <<<<<<< TREE | ||
| 355 | 4520 | #: code:addons/account/account_invoice.py:631 | 4645 | #: code:addons/account/account_invoice.py:631 |
| 356 | 4646 | ======= | ||
| 357 | 4647 | #: code:addons/account/account_invoice.py:658 | ||
| 358 | 4648 | >>>>>>> MERGE-SOURCE | ||
| 359 | 4521 | #, python-format | 4649 | #, python-format |
| 360 | 4522 | msgid "Cannot find any account journal of %s type for this company.\n" | 4650 | msgid "Cannot find any account journal of %s type for this company.\n" |
| 361 | 4523 | "\n" | 4651 | "\n" |
| 362 | @@ -4830,7 +4958,11 @@ | |||
| 363 | 4830 | msgstr "" | 4958 | msgstr "" |
| 364 | 4831 | 4959 | ||
| 365 | 4832 | #. module: account | 4960 | #. module: account |
| 366 | 4961 | <<<<<<< TREE | ||
| 367 | 4833 | #: code:addons/account/account_invoice.py:894 | 4962 | #: code:addons/account/account_invoice.py:894 |
| 368 | 4963 | ======= | ||
| 369 | 4964 | #: code:addons/account/account_invoice.py:922 | ||
| 370 | 4965 | >>>>>>> MERGE-SOURCE | ||
| 371 | 4834 | #, python-format | 4966 | #, python-format |
| 372 | 4835 | msgid "Please verify the price of the invoice !\n" | 4967 | msgid "Please verify the price of the invoice !\n" |
| 373 | 4836 | "The encoded total does not match the computed total." | 4968 | "The encoded total does not match the computed total." |
| 374 | @@ -5142,7 +5274,11 @@ | |||
| 375 | 5142 | msgstr "" | 5274 | msgstr "" |
| 376 | 5143 | 5275 | ||
| 377 | 5144 | #. module: account | 5276 | #. module: account |
| 378 | 5277 | <<<<<<< TREE | ||
| 379 | 5145 | #: code:addons/account/account_invoice.py:489 | 5278 | #: code:addons/account/account_invoice.py:489 |
| 380 | 5279 | ======= | ||
| 381 | 5280 | #: code:addons/account/account_invoice.py:508 | ||
| 382 | 5281 | >>>>>>> MERGE-SOURCE | ||
| 383 | 5146 | #, python-format | 5282 | #, python-format |
| 384 | 5147 | msgid "Cannot find a chart of accounts for this company, you should create one." | 5283 | msgid "Cannot find a chart of accounts for this company, you should create one." |
| 385 | 5148 | msgstr "" | 5284 | msgstr "" |
| 386 | @@ -5504,6 +5640,15 @@ | |||
| 387 | 5504 | msgstr "" | 5640 | msgstr "" |
| 388 | 5505 | 5641 | ||
| 389 | 5506 | #. module: account | 5642 | #. module: account |
| 390 | 5643 | <<<<<<< TREE | ||
| 391 | 5644 | ======= | ||
| 392 | 5645 | #: code:addons/account/account_invoice.py:474 | ||
| 393 | 5646 | #, python-format | ||
| 394 | 5647 | msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it." | ||
| 395 | 5648 | msgstr "" | ||
| 396 | 5649 | |||
| 397 | 5650 | #. module: account | ||
| 398 | 5651 | >>>>>>> MERGE-SOURCE | ||
| 399 | 5507 | #: help:account.automatic.reconcile,power:0 | 5652 | #: help:account.automatic.reconcile,power:0 |
| 400 | 5508 | msgid "Number of partial amounts that can be combined to find a balance point can be chosen as the power of the automatic reconciliation" | 5653 | msgid "Number of partial amounts that can be combined to find a balance point can be chosen as the power of the automatic reconciliation" |
| 401 | 5509 | msgstr "" | 5654 | msgstr "" |
| 402 | @@ -5653,7 +5798,11 @@ | |||
| 403 | 5653 | #: view:account.config.settings:0 | 5798 | #: view:account.config.settings:0 |
| 404 | 5654 | #: view:account.invoice:0 | 5799 | #: view:account.invoice:0 |
| 405 | 5655 | #: view:account.invoice.report:0 | 5800 | #: view:account.invoice.report:0 |
| 406 | 5801 | <<<<<<< TREE | ||
| 407 | 5656 | #: code:addons/account/account_invoice.py:363 | 5802 | #: code:addons/account/account_invoice.py:363 |
| 408 | 5803 | ======= | ||
| 409 | 5804 | #: code:addons/account/account_invoice.py:390 | ||
| 410 | 5805 | >>>>>>> MERGE-SOURCE | ||
| 411 | 5657 | #, python-format | 5806 | #, python-format |
| 412 | 5658 | msgid "Supplier" | 5807 | msgid "Supplier" |
| 413 | 5659 | msgstr "" | 5808 | msgstr "" |
| 414 | @@ -5673,7 +5822,11 @@ | |||
| 415 | 5673 | msgstr "" | 5822 | msgstr "" |
| 416 | 5674 | 5823 | ||
| 417 | 5675 | #. module: account | 5824 | #. module: account |
| 418 | 5825 | <<<<<<< TREE | ||
| 419 | 5676 | #: code:addons/account/account_invoice.py:91 | 5826 | #: code:addons/account/account_invoice.py:91 |
| 420 | 5827 | ======= | ||
| 421 | 5828 | #: code:addons/account/account_invoice.py:95 | ||
| 422 | 5829 | >>>>>>> MERGE-SOURCE | ||
| 423 | 5677 | #, python-format | 5830 | #, python-format |
| 424 | 5678 | msgid "Free Reference" | 5831 | msgid "Free Reference" |
| 425 | 5679 | msgstr "" | 5832 | msgstr "" |
| 426 | @@ -5683,7 +5836,9 @@ | |||
| 427 | 5683 | #: selection:account.common.partner.report,result_selection:0 | 5836 | #: selection:account.common.partner.report,result_selection:0 |
| 428 | 5684 | #: selection:account.partner.balance,result_selection:0 | 5837 | #: selection:account.partner.balance,result_selection:0 |
| 429 | 5685 | #: selection:account.partner.ledger,result_selection:0 | 5838 | #: selection:account.partner.ledger,result_selection:0 |
| 430 | 5839 | #: report:account.third_party_ledger:0 | ||
| 431 | 5686 | #: code:addons/account/report/account_partner_balance.py:301 | 5840 | #: code:addons/account/report/account_partner_balance.py:301 |
| 432 | 5841 | #: code:addons/account/report/account_partner_ledger.py:276 | ||
| 433 | 5687 | #, python-format | 5842 | #, python-format |
| 434 | 5688 | msgid "Receivable and Payable Accounts" | 5843 | msgid "Receivable and Payable Accounts" |
| 435 | 5689 | msgstr "" | 5844 | msgstr "" |
| 436 | @@ -5963,7 +6118,11 @@ | |||
| 437 | 5963 | msgstr "" | 6118 | msgstr "" |
| 438 | 5964 | 6119 | ||
| 439 | 5965 | #. module: account | 6120 | #. module: account |
| 440 | 6121 | <<<<<<< TREE | ||
| 441 | 5966 | #: code:addons/account/account_invoice.py:1095 | 6122 | #: code:addons/account/account_invoice.py:1095 |
| 442 | 6123 | ======= | ||
| 443 | 6124 | #: code:addons/account/account_invoice.py:1124 | ||
| 444 | 6125 | >>>>>>> MERGE-SOURCE | ||
| 445 | 5967 | #, python-format | 6126 | #, python-format |
| 446 | 5968 | msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." | 6127 | msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." |
| 447 | 5969 | msgstr "" | 6128 | msgstr "" |
| 448 | @@ -6129,7 +6288,11 @@ | |||
| 449 | 6129 | msgstr "" | 6288 | msgstr "" |
| 450 | 6130 | 6289 | ||
| 451 | 6131 | #. module: account | 6290 | #. module: account |
| 452 | 6291 | <<<<<<< TREE | ||
| 453 | 6132 | #: code:addons/account/account_invoice.py:610 | 6292 | #: code:addons/account/account_invoice.py:610 |
| 454 | 6293 | ======= | ||
| 455 | 6294 | #: code:addons/account/account_invoice.py:633 | ||
| 456 | 6295 | >>>>>>> MERGE-SOURCE | ||
| 457 | 6133 | #, python-format | 6296 | #, python-format |
| 458 | 6134 | msgid "Invoice line account's company and invoice's compnay does not match." | 6297 | msgid "Invoice line account's company and invoice's compnay does not match." |
| 459 | 6135 | msgstr "" | 6298 | msgstr "" |
| 460 | @@ -6262,12 +6425,21 @@ | |||
| 461 | 6262 | msgstr "" | 6425 | msgstr "" |
| 462 | 6263 | 6426 | ||
| 463 | 6264 | #. module: account | 6427 | #. module: account |
| 464 | 6428 | <<<<<<< TREE | ||
| 465 | 6265 | #: code:addons/account/account.py:1410 | 6429 | #: code:addons/account/account.py:1410 |
| 466 | 6266 | #: code:addons/account/account.py:1415 | 6430 | #: code:addons/account/account.py:1415 |
| 467 | 6267 | #: code:addons/account/account.py:1444 | 6431 | #: code:addons/account/account.py:1444 |
| 468 | 6268 | #: code:addons/account/account.py:1451 | 6432 | #: code:addons/account/account.py:1451 |
| 469 | 6269 | #: code:addons/account/account_invoice.py:987 | 6433 | #: code:addons/account/account_invoice.py:987 |
| 470 | 6270 | #: code:addons/account/account_move_line.py:1008 | 6434 | #: code:addons/account/account_move_line.py:1008 |
| 471 | 6435 | ======= | ||
| 472 | 6436 | #: code:addons/account/account.py:1448 | ||
| 473 | 6437 | #: code:addons/account/account.py:1453 | ||
| 474 | 6438 | #: code:addons/account/account.py:1482 | ||
| 475 | 6439 | #: code:addons/account/account.py:1489 | ||
| 476 | 6440 | #: code:addons/account/account_invoice.py:1015 | ||
| 477 | 6441 | #: code:addons/account/account_move_line.py:1005 | ||
| 478 | 6442 | >>>>>>> MERGE-SOURCE | ||
| 479 | 6271 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 | 6443 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
| 480 | 6272 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 | 6444 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
| 481 | 6273 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 | 6445 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
| 482 | @@ -6336,6 +6508,10 @@ | |||
| 483 | 6336 | #: report:account.invoice:0 | 6508 | #: report:account.invoice:0 |
| 484 | 6337 | #: selection:account.invoice,type:0 | 6509 | #: selection:account.invoice,type:0 |
| 485 | 6338 | #: selection:account.invoice.report,type:0 | 6510 | #: selection:account.invoice.report,type:0 |
| 486 | 6511 | <<<<<<< TREE | ||
| 487 | 6512 | ======= | ||
| 488 | 6513 | #: code:addons/account/account_invoice.py:1160 | ||
| 489 | 6514 | >>>>>>> MERGE-SOURCE | ||
| 490 | 6339 | #: selection:report.invoice.created,type:0 | 6515 | #: selection:report.invoice.created,type:0 |
| 491 | 6340 | msgid "Supplier Refund" | 6516 | msgid "Supplier Refund" |
| 492 | 6341 | msgstr "" | 6517 | msgstr "" |
| 493 | @@ -7386,7 +7562,11 @@ | |||
| 494 | 7386 | msgstr "" | 7562 | msgstr "" |
| 495 | 7387 | 7563 | ||
| 496 | 7388 | #. module: account | 7564 | #. module: account |
| 497 | 7565 | <<<<<<< TREE | ||
| 498 | 7389 | #: code:addons/account/account_invoice.py:792 | 7566 | #: code:addons/account/account_invoice.py:792 |
| 499 | 7567 | ======= | ||
| 500 | 7568 | #: code:addons/account/account_invoice.py:820 | ||
| 501 | 7569 | >>>>>>> MERGE-SOURCE | ||
| 502 | 7390 | #, python-format | 7570 | #, python-format |
| 503 | 7391 | msgid "Global taxes defined, but they are not in invoice lines !" | 7571 | msgid "Global taxes defined, but they are not in invoice lines !" |
| 504 | 7392 | msgstr "" | 7572 | msgstr "" |
| 505 | @@ -7425,7 +7605,11 @@ | |||
| 506 | 7425 | #: view:account.config.settings:0 | 7605 | #: view:account.config.settings:0 |
| 507 | 7426 | #: view:account.invoice:0 | 7606 | #: view:account.invoice:0 |
| 508 | 7427 | #: view:account.invoice.report:0 | 7607 | #: view:account.invoice.report:0 |
| 509 | 7608 | <<<<<<< TREE | ||
| 510 | 7428 | #: code:addons/account/account_invoice.py:361 | 7609 | #: code:addons/account/account_invoice.py:361 |
| 511 | 7610 | ======= | ||
| 512 | 7611 | #: code:addons/account/account_invoice.py:388 | ||
| 513 | 7612 | >>>>>>> MERGE-SOURCE | ||
| 514 | 7429 | #, python-format | 7613 | #, python-format |
| 515 | 7430 | msgid "Customer" | 7614 | msgid "Customer" |
| 516 | 7431 | msgstr "" | 7615 | msgstr "" |
| 517 | @@ -7553,6 +7737,15 @@ | |||
| 518 | 7553 | msgstr "" | 7737 | msgstr "" |
| 519 | 7554 | 7738 | ||
| 520 | 7555 | #. module: account | 7739 | #. module: account |
| 521 | 7740 | <<<<<<< TREE | ||
| 522 | 7741 | ======= | ||
| 523 | 7742 | #: code:addons/account/account_invoice.py:472 | ||
| 524 | 7743 | #, python-format | ||
| 525 | 7744 | msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead." | ||
| 526 | 7745 | msgstr "" | ||
| 527 | 7746 | |||
| 528 | 7747 | #. module: account | ||
| 529 | 7748 | >>>>>>> MERGE-SOURCE | ||
| 530 | 7556 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement | 7749 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
| 531 | 7557 | msgid "Legal Reports" | 7750 | msgid "Legal Reports" |
| 532 | 7558 | msgstr "" | 7751 | msgstr "" |
| 533 | @@ -7662,7 +7855,11 @@ | |||
| 534 | 7662 | msgstr "" | 7855 | msgstr "" |
| 535 | 7663 | 7856 | ||
| 536 | 7664 | #. module: account | 7857 | #. module: account |
| 537 | 7858 | <<<<<<< TREE | ||
| 538 | 7665 | #: code:addons/account/account_invoice.py:873 | 7859 | #: code:addons/account/account_invoice.py:873 |
| 539 | 7860 | ======= | ||
| 540 | 7861 | #: code:addons/account/account_invoice.py:901 | ||
| 541 | 7862 | >>>>>>> MERGE-SOURCE | ||
| 542 | 7666 | #, python-format | 7863 | #, python-format |
| 543 | 7667 | msgid "No Invoice Lines !" | 7864 | msgid "No Invoice Lines !" |
| 544 | 7668 | msgstr "" | 7865 | msgstr "" |
| 545 | @@ -7732,7 +7929,11 @@ | |||
| 546 | 7732 | msgstr "" | 7929 | msgstr "" |
| 547 | 7733 | 7930 | ||
| 548 | 7734 | #. module: account | 7931 | #. module: account |
| 549 | 7932 | <<<<<<< TREE | ||
| 550 | 7735 | #: code:addons/account/account_invoice.py:1428 | 7933 | #: code:addons/account/account_invoice.py:1428 |
| 551 | 7934 | ======= | ||
| 552 | 7935 | #: code:addons/account/account_invoice.py:1465 | ||
| 553 | 7936 | >>>>>>> MERGE-SOURCE | ||
| 554 | 7736 | #, python-format | 7937 | #, python-format |
| 555 | 7737 | msgid "You must first select a partner !" | 7938 | msgid "You must first select a partner !" |
| 556 | 7738 | msgstr "" | 7939 | msgstr "" |
| 557 | @@ -8618,7 +8819,11 @@ | |||
| 558 | 8618 | msgstr "" | 8819 | msgstr "" |
| 559 | 8619 | 8820 | ||
| 560 | 8620 | #. module: account | 8821 | #. module: account |
| 561 | 8822 | <<<<<<< TREE | ||
| 562 | 8621 | #: code:addons/account/account_invoice.py:873 | 8823 | #: code:addons/account/account_invoice.py:873 |
| 563 | 8824 | ======= | ||
| 564 | 8825 | #: code:addons/account/account_invoice.py:901 | ||
| 565 | 8826 | >>>>>>> MERGE-SOURCE | ||
| 566 | 8622 | #, python-format | 8827 | #, python-format |
| 567 | 8623 | msgid "Please create some invoice lines." | 8828 | msgid "Please create some invoice lines." |
| 568 | 8624 | msgstr "" | 8829 | msgstr "" |
| 569 | @@ -9146,7 +9351,11 @@ | |||
| 570 | 9146 | msgstr "" | 9351 | msgstr "" |
| 571 | 9147 | 9352 | ||
| 572 | 9148 | #. module: account | 9353 | #. module: account |
| 573 | 9354 | <<<<<<< TREE | ||
| 574 | 9149 | #: code:addons/account/account_invoice.py:894 | 9355 | #: code:addons/account/account_invoice.py:894 |
| 575 | 9356 | ======= | ||
| 576 | 9357 | #: code:addons/account/account_invoice.py:922 | ||
| 577 | 9358 | >>>>>>> MERGE-SOURCE | ||
| 578 | 9150 | #, python-format | 9359 | #, python-format |
| 579 | 9151 | msgid "Bad total !" | 9360 | msgid "Bad total !" |
| 580 | 9152 | msgstr "" | 9361 | msgstr "" |
| 581 | @@ -9598,6 +9807,7 @@ | |||
| 582 | 9598 | 9807 | ||
| 583 | 9599 | #. module: account | 9808 | #. module: account |
| 584 | 9600 | #: field:account.account,company_id:0 | 9809 | #: field:account.account,company_id:0 |
| 585 | 9810 | #: report:account.account.balance:0 | ||
| 586 | 9601 | #: field:account.aged.trial.balance,company_id:0 | 9811 | #: field:account.aged.trial.balance,company_id:0 |
| 587 | 9602 | #: field:account.analytic.journal,company_id:0 | 9812 | #: field:account.analytic.journal,company_id:0 |
| 588 | 9603 | #: field:account.balance.report,company_id:0 | 9813 | #: field:account.balance.report,company_id:0 |
| 589 | @@ -9613,7 +9823,9 @@ | |||
| 590 | 9613 | #: field:account.entries.report,company_id:0 | 9823 | #: field:account.entries.report,company_id:0 |
| 591 | 9614 | #: field:account.fiscal.position,company_id:0 | 9824 | #: field:account.fiscal.position,company_id:0 |
| 592 | 9615 | #: field:account.fiscalyear,company_id:0 | 9825 | #: field:account.fiscalyear,company_id:0 |
| 593 | 9826 | #: report:account.general.journal:0 | ||
| 594 | 9616 | #: field:account.general.journal,company_id:0 | 9827 | #: field:account.general.journal,company_id:0 |
| 595 | 9828 | #: report:account.general.ledger_landscape:0 | ||
| 596 | 9617 | #: field:account.installer,company_id:0 | 9829 | #: field:account.installer,company_id:0 |
| 597 | 9618 | #: field:account.invoice,company_id:0 | 9830 | #: field:account.invoice,company_id:0 |
| 598 | 9619 | #: field:account.invoice.line,company_id:0 | 9831 | #: field:account.invoice.line,company_id:0 |
| 599 | @@ -9622,6 +9834,7 @@ | |||
| 600 | 9622 | #: field:account.invoice.tax,company_id:0 | 9834 | #: field:account.invoice.tax,company_id:0 |
| 601 | 9623 | #: field:account.journal,company_id:0 | 9835 | #: field:account.journal,company_id:0 |
| 602 | 9624 | #: field:account.journal.period,company_id:0 | 9836 | #: field:account.journal.period,company_id:0 |
| 603 | 9837 | #: report:account.journal.period.print:0 | ||
| 604 | 9625 | #: field:account.model,company_id:0 | 9838 | #: field:account.model,company_id:0 |
| 605 | 9626 | #: field:account.move,company_id:0 | 9839 | #: field:account.move,company_id:0 |
| 606 | 9627 | #: field:account.move.line,company_id:0 | 9840 | #: field:account.move.line,company_id:0 |
| 607 | @@ -9773,6 +9986,10 @@ | |||
| 608 | 9773 | #: view:account.invoice:0 | 9986 | #: view:account.invoice:0 |
| 609 | 9774 | #: selection:account.invoice,type:0 | 9987 | #: selection:account.invoice,type:0 |
| 610 | 9775 | #: selection:account.invoice.report,type:0 | 9988 | #: selection:account.invoice.report,type:0 |
| 611 | 9989 | <<<<<<< TREE | ||
| 612 | 9990 | ======= | ||
| 613 | 9991 | #: code:addons/account/account_invoice.py:1158 | ||
| 614 | 9992 | >>>>>>> MERGE-SOURCE | ||
| 615 | 9776 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 | 9993 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
| 616 | 9777 | #: selection:report.invoice.created,type:0 | 9994 | #: selection:report.invoice.created,type:0 |
| 617 | 9778 | msgid "Supplier Invoice" | 9995 | msgid "Supplier Invoice" |
| 618 | @@ -9855,8 +10072,10 @@ | |||
| 619 | 9855 | msgstr "" | 10072 | msgstr "" |
| 620 | 9856 | 10073 | ||
| 621 | 9857 | #. module: account | 10074 | #. module: account |
| 622 | 10075 | #: report:account.account.balance:0 | ||
| 623 | 9858 | #: selection:account.balance.report,display_account:0 | 10076 | #: selection:account.balance.report,display_account:0 |
| 624 | 9859 | #: selection:account.common.account.report,display_account:0 | 10077 | #: selection:account.common.account.report,display_account:0 |
| 625 | 10078 | #: report:account.general.ledger_landscape:0 | ||
| 626 | 9860 | #: selection:account.report.general.ledger,display_account:0 | 10079 | #: selection:account.report.general.ledger,display_account:0 |
| 627 | 9861 | msgid "With movements" | 10080 | msgid "With movements" |
| 628 | 9862 | msgstr "" | 10081 | msgstr "" |
| 629 | @@ -9949,7 +10168,11 @@ | |||
| 630 | 9949 | msgstr "" | 10168 | msgstr "" |
| 631 | 9950 | 10169 | ||
| 632 | 9951 | #. module: account | 10170 | #. module: account |
| 633 | 10171 | <<<<<<< TREE | ||
| 634 | 9952 | #: code:addons/account/account_invoice.py:1510 | 10172 | #: code:addons/account/account_invoice.py:1510 |
| 635 | 10173 | ======= | ||
| 636 | 10174 | #: code:addons/account/account_invoice.py:1546 | ||
| 637 | 10175 | >>>>>>> MERGE-SOURCE | ||
| 638 | 9953 | #, python-format | 10176 | #, python-format |
| 639 | 9954 | msgid "The selected unit of measure is not compatible with the unit of measure of the product." | 10177 | msgid "The selected unit of measure is not compatible with the unit of measure of the product." |
| 640 | 9955 | msgstr "" | 10178 | msgstr "" |
| 641 | @@ -10021,6 +10244,11 @@ | |||
| 642 | 10021 | #: report:account.invoice:0 | 10244 | #: report:account.invoice:0 |
| 643 | 10022 | #: view:account.invoice:0 | 10245 | #: view:account.invoice:0 |
| 644 | 10023 | #: view:account.invoice.report:0 | 10246 | #: view:account.invoice.report:0 |
| 645 | 10247 | <<<<<<< TREE | ||
| 646 | 10248 | ======= | ||
| 647 | 10249 | #: code:addons/account/account_invoice.py:1159 | ||
| 648 | 10250 | #, python-format | ||
| 649 | 10251 | >>>>>>> MERGE-SOURCE | ||
| 650 | 10024 | msgid "Refund" | 10252 | msgid "Refund" |
| 651 | 10025 | msgstr "" | 10253 | msgstr "" |
| 652 | 10026 | 10254 | ||
| 653 | @@ -10088,7 +10316,11 @@ | |||
| 654 | 10088 | msgstr "" | 10316 | msgstr "" |
| 655 | 10089 | 10317 | ||
| 656 | 10090 | #. module: account | 10318 | #. module: account |
| 657 | 10319 | <<<<<<< TREE | ||
| 658 | 10091 | #: code:addons/account/account_invoice.py:554 | 10320 | #: code:addons/account/account_invoice.py:554 |
| 659 | 10321 | ======= | ||
| 660 | 10322 | #: code:addons/account/account_invoice.py:573 | ||
| 661 | 10323 | >>>>>>> MERGE-SOURCE | ||
| 662 | 10092 | #, python-format | 10324 | #, python-format |
| 663 | 10093 | msgid "The payment term of supplier does not have a payment term line." | 10325 | msgid "The payment term of supplier does not have a payment term line." |
| 664 | 10094 | msgstr "" | 10326 | msgstr "" |
| 665 | 10095 | 10327 | ||
| 666 | === modified file 'account/i18n/ar.po' | |||
| 667 | --- account/i18n/ar.po 2013-06-13 18:15:03 +0000 | |||
| 668 | +++ account/i18n/ar.po 2013-06-19 09:20:00 +0000 | |||
| 669 | @@ -4,17 +4,31 @@ | |||
| 670 | 4 | # | 4 | # |
| 671 | 5 | msgid "" | 5 | msgid "" |
| 672 | 6 | msgstr "" | 6 | msgstr "" |
| 673 | 7 | <<<<<<< TREE | ||
| 674 | 7 | "Project-Id-Version: OpenERP Server 6.0dev\n" | 8 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
| 675 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
| 676 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
| 677 | 10 | "PO-Revision-Date: 2012-12-15 22:53+0000\n" | 11 | "PO-Revision-Date: 2012-12-15 22:53+0000\n" |
| 678 | 11 | "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n" | 12 | "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n" |
| 679 | 12 | "Language-Team: \n" | 13 | "Language-Team: \n" |
| 680 | 14 | ======= | ||
| 681 | 15 | "Project-Id-Version: openobject-addons\n" | ||
| 682 | 16 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 683 | 17 | "POT-Creation-Date: 2013-06-14 22:29+0000\n" | ||
| 684 | 18 | "PO-Revision-Date: 2013-02-17 03:05+0000\n" | ||
| 685 | 19 | "Last-Translator: Ahmad Khayyat <Unknown>\n" | ||
| 686 | 20 | "Language-Team: Arabic <ar@li.org>\n" | ||
| 687 | 21 | >>>>>>> MERGE-SOURCE | ||
| 688 | 13 | "MIME-Version: 1.0\n" | 22 | "MIME-Version: 1.0\n" |
| 689 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 23 | "Content-Type: text/plain; charset=UTF-8\n" |
| 690 | 15 | "Content-Transfer-Encoding: 8bit\n" | 24 | "Content-Transfer-Encoding: 8bit\n" |
| 691 | 25 | <<<<<<< TREE | ||
| 692 | 16 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" | 26 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" |
| 693 | 17 | "X-Generator: Launchpad (build 16532)\n" | 27 | "X-Generator: Launchpad (build 16532)\n" |
| 694 | 28 | ======= | ||
| 695 | 29 | "X-Launchpad-Export-Date: 2013-06-15 06:13+0000\n" | ||
| 696 | 30 | "X-Generator: Launchpad (build 16667)\n" | ||
| 697 | 31 | >>>>>>> MERGE-SOURCE | ||
| 698 | 18 | 32 | ||
| 699 | 19 | #. module: account | 33 | #. module: account |
| 700 | 20 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 | 34 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
| 701 | @@ -133,11 +147,19 @@ | |||
| 702 | 133 | #: code:addons/account/account.py:641 | 147 | #: code:addons/account/account.py:641 |
| 703 | 134 | #: code:addons/account/account.py:686 | 148 | #: code:addons/account/account.py:686 |
| 704 | 135 | #: code:addons/account/account.py:781 | 149 | #: code:addons/account/account.py:781 |
| 705 | 150 | <<<<<<< TREE | ||
| 706 | 136 | #: code:addons/account/account.py:1049 | 151 | #: code:addons/account/account.py:1049 |
| 707 | 137 | #: code:addons/account/account_invoice.py:788 | 152 | #: code:addons/account/account_invoice.py:788 |
| 708 | 138 | #: code:addons/account/account_invoice.py:791 | 153 | #: code:addons/account/account_invoice.py:791 |
| 709 | 139 | #: code:addons/account/account_invoice.py:794 | 154 | #: code:addons/account/account_invoice.py:794 |
| 710 | 140 | #: code:addons/account/account_invoice.py:1514 | 155 | #: code:addons/account/account_invoice.py:1514 |
| 711 | 156 | ======= | ||
| 712 | 157 | #: code:addons/account/account.py:1058 | ||
| 713 | 158 | #: code:addons/account/account_invoice.py:820 | ||
| 714 | 159 | #: code:addons/account/account_invoice.py:823 | ||
| 715 | 160 | #: code:addons/account/account_invoice.py:826 | ||
| 716 | 161 | #: code:addons/account/account_invoice.py:1545 | ||
| 717 | 162 | >>>>>>> MERGE-SOURCE | ||
| 718 | 141 | #: code:addons/account/account_move_line.py:98 | 163 | #: code:addons/account/account_move_line.py:98 |
| 719 | 142 | #: code:addons/account/account_move_line.py:774 | 164 | #: code:addons/account/account_move_line.py:774 |
| 720 | 143 | #: code:addons/account/account_move_line.py:827 | 165 | #: code:addons/account/account_move_line.py:827 |
| 721 | @@ -342,7 +364,7 @@ | |||
| 722 | 342 | msgstr "السماح لأكثر من عملة" | 364 | msgstr "السماح لأكثر من عملة" |
| 723 | 343 | 365 | ||
| 724 | 344 | #. module: account | 366 | #. module: account |
| 726 | 345 | #: code:addons/account/account_invoice.py:74 | 367 | #: code:addons/account/account_invoice.py:77 |
| 727 | 346 | #, python-format | 368 | #, python-format |
| 728 | 347 | msgid "You must define an analytic journal of type '%s'!" | 369 | msgid "You must define an analytic journal of type '%s'!" |
| 729 | 348 | msgstr "يجب تعريف دفتر يومية تحليلي من نوع '%s'!" | 370 | msgstr "يجب تعريف دفتر يومية تحليلي من نوع '%s'!" |
| 730 | @@ -598,11 +620,23 @@ | |||
| 731 | 598 | msgstr "الحساب يؤكد الكشف" | 620 | msgstr "الحساب يؤكد الكشف" |
| 732 | 599 | 621 | ||
| 733 | 600 | #. module: account | 622 | #. module: account |
| 734 | 623 | <<<<<<< TREE | ||
| 735 | 601 | #. openerp-web | 624 | #. openerp-web |
| 736 | 602 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 | 625 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
| 737 | 603 | #, python-format | 626 | #, python-format |
| 738 | 604 | msgid "Nothing to reconcile" | 627 | msgid "Nothing to reconcile" |
| 739 | 605 | msgstr "لا يوجد شيء لتسويته" | 628 | msgstr "لا يوجد شيء لتسويته" |
| 740 | 629 | ======= | ||
| 741 | 630 | #: report:account.account.balance:0 | ||
| 742 | 631 | #: selection:account.balance.report,display_account:0 | ||
| 743 | 632 | #: selection:account.common.account.report,display_account:0 | ||
| 744 | 633 | #: report:account.general.ledger_landscape:0 | ||
| 745 | 634 | #: selection:account.report.general.ledger,display_account:0 | ||
| 746 | 635 | #: selection:account.tax,type_tax_use:0 | ||
| 747 | 636 | #: selection:account.tax.template,type_tax_use:0 | ||
| 748 | 637 | msgid "All" | ||
| 749 | 638 | msgstr "الكل" | ||
| 750 | 639 | >>>>>>> MERGE-SOURCE | ||
| 751 | 606 | 640 | ||
| 752 | 607 | #. module: account | 641 | #. module: account |
| 753 | 608 | #: field:account.config.settings,decimal_precision:0 | 642 | #: field:account.config.settings,decimal_precision:0 |
| 754 | @@ -733,7 +767,9 @@ | |||
| 755 | 733 | #: selection:account.common.partner.report,result_selection:0 | 767 | #: selection:account.common.partner.report,result_selection:0 |
| 756 | 734 | #: selection:account.partner.balance,result_selection:0 | 768 | #: selection:account.partner.balance,result_selection:0 |
| 757 | 735 | #: selection:account.partner.ledger,result_selection:0 | 769 | #: selection:account.partner.ledger,result_selection:0 |
| 758 | 770 | #: report:account.third_party_ledger:0 | ||
| 759 | 736 | #: code:addons/account/report/account_partner_balance.py:297 | 771 | #: code:addons/account/report/account_partner_balance.py:297 |
| 760 | 772 | #: code:addons/account/report/account_partner_ledger.py:272 | ||
| 761 | 737 | #, python-format | 773 | #, python-format |
| 762 | 738 | msgid "Receivable Accounts" | 774 | msgid "Receivable Accounts" |
| 763 | 739 | msgstr "حسابات مدينة" | 775 | msgstr "حسابات مدينة" |
| 764 | @@ -773,7 +809,11 @@ | |||
| 765 | 773 | msgstr "هل أنت متأكد من إنشاء القيد؟" | 809 | msgstr "هل أنت متأكد من إنشاء القيد؟" |
| 766 | 774 | 810 | ||
| 767 | 775 | #. module: account | 811 | #. module: account |
| 768 | 812 | <<<<<<< TREE | ||
| 769 | 776 | #: code:addons/account/account_invoice.py:1330 | 813 | #: code:addons/account/account_invoice.py:1330 |
| 770 | 814 | ======= | ||
| 771 | 815 | #: code:addons/account/account_invoice.py:1361 | ||
| 772 | 816 | >>>>>>> MERGE-SOURCE | ||
| 773 | 777 | #, python-format | 817 | #, python-format |
| 774 | 778 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." | 818 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
| 775 | 779 | msgstr "" | 819 | msgstr "" |
| 776 | @@ -844,7 +884,11 @@ | |||
| 777 | 844 | msgstr "نوع" | 884 | msgstr "نوع" |
| 778 | 845 | 885 | ||
| 779 | 846 | #. module: account | 886 | #. module: account |
| 780 | 887 | <<<<<<< TREE | ||
| 781 | 847 | #: code:addons/account/account_invoice.py:794 | 888 | #: code:addons/account/account_invoice.py:794 |
| 782 | 889 | ======= | ||
| 783 | 890 | #: code:addons/account/account_invoice.py:826 | ||
| 784 | 891 | >>>>>>> MERGE-SOURCE | ||
| 785 | 848 | #, python-format | 892 | #, python-format |
| 786 | 849 | msgid "" | 893 | msgid "" |
| 787 | 850 | "Taxes are missing!\n" | 894 | "Taxes are missing!\n" |
| 788 | @@ -1026,7 +1070,11 @@ | |||
| 789 | 1026 | msgstr "الخصوم" | 1070 | msgstr "الخصوم" |
| 790 | 1027 | 1071 | ||
| 791 | 1028 | #. module: account | 1072 | #. module: account |
| 792 | 1073 | <<<<<<< TREE | ||
| 793 | 1029 | #: code:addons/account/account_invoice.py:867 | 1074 | #: code:addons/account/account_invoice.py:867 |
| 794 | 1075 | ======= | ||
| 795 | 1076 | #: code:addons/account/account_invoice.py:899 | ||
| 796 | 1077 | >>>>>>> MERGE-SOURCE | ||
| 797 | 1030 | #, python-format | 1078 | #, python-format |
| 798 | 1031 | msgid "Please define sequence on the journal related to this invoice." | 1079 | msgid "Please define sequence on the journal related to this invoice." |
| 799 | 1032 | msgstr "من فضلك حدد تسلسل دفاتير اليومية التي لها علاقة بهذه الفاتورة" | 1080 | msgstr "من فضلك حدد تسلسل دفاتير اليومية التي لها علاقة بهذه الفاتورة" |
| 800 | @@ -1100,10 +1148,17 @@ | |||
| 801 | 1100 | msgstr "مزايا" | 1148 | msgstr "مزايا" |
| 802 | 1101 | 1149 | ||
| 803 | 1102 | #. module: account | 1150 | #. module: account |
| 804 | 1151 | <<<<<<< TREE | ||
| 805 | 1103 | #: code:addons/account/account.py:2308 | 1152 | #: code:addons/account/account.py:2308 |
| 806 | 1104 | #: code:addons/account/account_bank_statement.py:423 | 1153 | #: code:addons/account/account_bank_statement.py:423 |
| 807 | 1105 | #: code:addons/account/account_invoice.py:74 | 1154 | #: code:addons/account/account_invoice.py:74 |
| 808 | 1106 | #: code:addons/account/account_invoice.py:744 | 1155 | #: code:addons/account/account_invoice.py:744 |
| 809 | 1156 | ======= | ||
| 810 | 1157 | #: code:addons/account/account.py:2346 | ||
| 811 | 1158 | #: code:addons/account/account_bank_statement.py:424 | ||
| 812 | 1159 | #: code:addons/account/account_invoice.py:77 | ||
| 813 | 1160 | #: code:addons/account/account_invoice.py:775 | ||
| 814 | 1161 | >>>>>>> MERGE-SOURCE | ||
| 815 | 1107 | #: code:addons/account/account_move_line.py:195 | 1162 | #: code:addons/account/account_move_line.py:195 |
| 816 | 1108 | #, python-format | 1163 | #, python-format |
| 817 | 1109 | msgid "No Analytic Journal !" | 1164 | msgid "No Analytic Journal !" |
| 818 | @@ -1540,8 +1595,10 @@ | |||
| 819 | 1540 | msgstr "" | 1595 | msgstr "" |
| 820 | 1541 | 1596 | ||
| 821 | 1542 | #. module: account | 1597 | #. module: account |
| 822 | 1598 | #: report:account.account.balance:0 | ||
| 823 | 1543 | #: selection:account.balance.report,display_account:0 | 1599 | #: selection:account.balance.report,display_account:0 |
| 824 | 1544 | #: selection:account.common.account.report,display_account:0 | 1600 | #: selection:account.common.account.report,display_account:0 |
| 825 | 1601 | #: report:account.general.ledger_landscape:0 | ||
| 826 | 1545 | #: selection:account.partner.balance,display_partner:0 | 1602 | #: selection:account.partner.balance,display_partner:0 |
| 827 | 1546 | #: selection:account.report.general.ledger,display_account:0 | 1603 | #: selection:account.report.general.ledger,display_account:0 |
| 828 | 1547 | msgid "With balance is not equal to 0" | 1604 | msgid "With balance is not equal to 0" |
| 829 | @@ -1775,6 +1832,10 @@ | |||
| 830 | 1775 | #: view:account.invoice:0 | 1832 | #: view:account.invoice:0 |
| 831 | 1776 | #: view:account.invoice.report:0 | 1833 | #: view:account.invoice.report:0 |
| 832 | 1777 | #: field:account.move.line,invoice:0 | 1834 | #: field:account.move.line,invoice:0 |
| 833 | 1835 | <<<<<<< TREE | ||
| 834 | 1836 | ======= | ||
| 835 | 1837 | #: code:addons/account/account_invoice.py:1157 | ||
| 836 | 1838 | >>>>>>> MERGE-SOURCE | ||
| 837 | 1778 | #: model:ir.model,name:account.model_account_invoice | 1839 | #: model:ir.model,name:account.model_account_invoice |
| 838 | 1779 | #: model:res.request.link,name:account.req_link_invoice | 1840 | #: model:res.request.link,name:account.req_link_invoice |
| 839 | 1780 | msgid "Invoice" | 1841 | msgid "Invoice" |
| 840 | @@ -2023,11 +2084,20 @@ | |||
| 841 | 2023 | #: code:addons/account/account_bank_statement.py:418 | 2084 | #: code:addons/account/account_bank_statement.py:418 |
| 842 | 2024 | #: code:addons/account/account_cash_statement.py:256 | 2085 | #: code:addons/account/account_cash_statement.py:256 |
| 843 | 2025 | #: code:addons/account/account_cash_statement.py:300 | 2086 | #: code:addons/account/account_cash_statement.py:300 |
| 844 | 2087 | <<<<<<< TREE | ||
| 845 | 2026 | #: code:addons/account/account_invoice.py:867 | 2088 | #: code:addons/account/account_invoice.py:867 |
| 846 | 2027 | #: code:addons/account/account_invoice.py:901 | 2089 | #: code:addons/account/account_invoice.py:901 |
| 847 | 2028 | #: code:addons/account/account_invoice.py:1091 | 2090 | #: code:addons/account/account_invoice.py:1091 |
| 848 | 2029 | #: code:addons/account/account_move_line.py:578 | 2091 | #: code:addons/account/account_move_line.py:578 |
| 849 | 2030 | #: code:addons/account/account_move_line.py:831 | 2092 | #: code:addons/account/account_move_line.py:831 |
| 850 | 2093 | ======= | ||
| 851 | 2094 | #: code:addons/account/account_invoice.py:899 | ||
| 852 | 2095 | #: code:addons/account/account_invoice.py:933 | ||
| 853 | 2096 | #: code:addons/account/account_invoice.py:1124 | ||
| 854 | 2097 | #: code:addons/account/account_move_line.py:579 | ||
| 855 | 2098 | #: code:addons/account/account_move_line.py:828 | ||
| 856 | 2099 | #: code:addons/account/account_move_line.py:851 | ||
| 857 | 2100 | >>>>>>> MERGE-SOURCE | ||
| 858 | 2031 | #: code:addons/account/account_move_line.py:854 | 2101 | #: code:addons/account/account_move_line.py:854 |
| 859 | 2032 | #: code:addons/account/account_move_line.py:857 | 2102 | #: code:addons/account/account_move_line.py:857 |
| 860 | 2033 | #: code:addons/account/account_move_line.py:1122 | 2103 | #: code:addons/account/account_move_line.py:1122 |
| 861 | @@ -2263,7 +2333,9 @@ | |||
| 862 | 2263 | #: selection:account.common.partner.report,result_selection:0 | 2333 | #: selection:account.common.partner.report,result_selection:0 |
| 863 | 2264 | #: selection:account.partner.balance,result_selection:0 | 2334 | #: selection:account.partner.balance,result_selection:0 |
| 864 | 2265 | #: selection:account.partner.ledger,result_selection:0 | 2335 | #: selection:account.partner.ledger,result_selection:0 |
| 865 | 2336 | #: report:account.third_party_ledger:0 | ||
| 866 | 2266 | #: code:addons/account/report/account_partner_balance.py:299 | 2337 | #: code:addons/account/report/account_partner_balance.py:299 |
| 867 | 2338 | #: code:addons/account/report/account_partner_ledger.py:274 | ||
| 868 | 2267 | #, python-format | 2339 | #, python-format |
| 869 | 2268 | msgid "Payable Accounts" | 2340 | msgid "Payable Accounts" |
| 870 | 2269 | msgstr "حسابات الدائنون" | 2341 | msgstr "حسابات الدائنون" |
| 871 | @@ -2575,7 +2647,11 @@ | |||
| 872 | 2575 | msgstr "انشأ حساب مبنيًا على هذا القالب" | 2647 | msgstr "انشأ حساب مبنيًا على هذا القالب" |
| 873 | 2576 | 2648 | ||
| 874 | 2577 | #. module: account | 2649 | #. module: account |
| 875 | 2650 | <<<<<<< TREE | ||
| 876 | 2578 | #: code:addons/account/account_invoice.py:901 | 2651 | #: code:addons/account/account_invoice.py:901 |
| 877 | 2652 | ======= | ||
| 878 | 2653 | #: code:addons/account/account_invoice.py:933 | ||
| 879 | 2654 | >>>>>>> MERGE-SOURCE | ||
| 880 | 2579 | #, python-format | 2655 | #, python-format |
| 881 | 2580 | msgid "" | 2656 | msgid "" |
| 882 | 2581 | "Cannot create the invoice.\n" | 2657 | "Cannot create the invoice.\n" |
| 883 | @@ -2849,6 +2925,7 @@ | |||
| 884 | 2849 | msgstr "حسابات" | 2925 | msgstr "حسابات" |
| 885 | 2850 | 2926 | ||
| 886 | 2851 | #. module: account | 2927 | #. module: account |
| 887 | 2928 | <<<<<<< TREE | ||
| 888 | 2852 | #: code:addons/account/account.py:3503 | 2929 | #: code:addons/account/account.py:3503 |
| 889 | 2853 | #: code:addons/account/account_bank_statement.py:404 | 2930 | #: code:addons/account/account_bank_statement.py:404 |
| 890 | 2854 | #: code:addons/account/account_invoice.py:378 | 2931 | #: code:addons/account/account_invoice.py:378 |
| 891 | @@ -2858,6 +2935,16 @@ | |||
| 892 | 2858 | #: code:addons/account/account_invoice.py:605 | 2935 | #: code:addons/account/account_invoice.py:605 |
| 893 | 2859 | #: code:addons/account/account_invoice.py:627 | 2936 | #: code:addons/account/account_invoice.py:627 |
| 894 | 2860 | #: code:addons/account/account_move_line.py:535 | 2937 | #: code:addons/account/account_move_line.py:535 |
| 895 | 2938 | ======= | ||
| 896 | 2939 | #: code:addons/account/account.py:3541 | ||
| 897 | 2940 | #: code:addons/account/account_bank_statement.py:405 | ||
| 898 | 2941 | #: code:addons/account/account_invoice.py:507 | ||
| 899 | 2942 | #: code:addons/account/account_invoice.py:609 | ||
| 900 | 2943 | #: code:addons/account/account_invoice.py:624 | ||
| 901 | 2944 | #: code:addons/account/account_invoice.py:632 | ||
| 902 | 2945 | #: code:addons/account/account_invoice.py:657 | ||
| 903 | 2946 | #: code:addons/account/account_move_line.py:536 | ||
| 904 | 2947 | >>>>>>> MERGE-SOURCE | ||
| 905 | 2861 | #, python-format | 2948 | #, python-format |
| 906 | 2862 | msgid "Configuration Error!" | 2949 | msgid "Configuration Error!" |
| 907 | 2863 | msgstr "خطأ في الإعدادات!" | 2950 | msgstr "خطأ في الإعدادات!" |
| 908 | @@ -3085,8 +3172,13 @@ | |||
| 909 | 3085 | msgstr "يومية البيع" | 3172 | msgstr "يومية البيع" |
| 910 | 3086 | 3173 | ||
| 911 | 3087 | #. module: account | 3174 | #. module: account |
| 912 | 3175 | <<<<<<< TREE | ||
| 913 | 3088 | #: code:addons/account/account.py:2308 | 3176 | #: code:addons/account/account.py:2308 |
| 914 | 3089 | #: code:addons/account/account_invoice.py:744 | 3177 | #: code:addons/account/account_invoice.py:744 |
| 915 | 3178 | ======= | ||
| 916 | 3179 | #: code:addons/account/account.py:2346 | ||
| 917 | 3180 | #: code:addons/account/account_invoice.py:775 | ||
| 918 | 3181 | >>>>>>> MERGE-SOURCE | ||
| 919 | 3090 | #: code:addons/account/account_move_line.py:195 | 3182 | #: code:addons/account/account_move_line.py:195 |
| 920 | 3091 | #, python-format | 3183 | #, python-format |
| 921 | 3092 | msgid "You have to define an analytic journal on the '%s' journal!" | 3184 | msgid "You have to define an analytic journal on the '%s' journal!" |
| 922 | @@ -3147,6 +3239,11 @@ | |||
| 923 | 3147 | msgstr "عرض خانة الدائن/المدين" | 3239 | msgstr "عرض خانة الدائن/المدين" |
| 924 | 3148 | 3240 | ||
| 925 | 3149 | #. module: account | 3241 | #. module: account |
| 926 | 3242 | #: report:account.journal.period.print:0 | ||
| 927 | 3243 | msgid "Reference Number" | ||
| 928 | 3244 | msgstr "رقم المرجع" | ||
| 929 | 3245 | |||
| 930 | 3246 | #. module: account | ||
| 931 | 3150 | #: selection:account.entries.report,month:0 | 3247 | #: selection:account.entries.report,month:0 |
| 932 | 3151 | #: selection:account.invoice.report,month:0 | 3248 | #: selection:account.invoice.report,month:0 |
| 933 | 3152 | #: selection:analytic.entries.report,month:0 | 3249 | #: selection:analytic.entries.report,month:0 |
| 934 | @@ -3249,7 +3346,11 @@ | |||
| 935 | 3249 | msgstr "الوضع المالي" | 3346 | msgstr "الوضع المالي" |
| 936 | 3250 | 3347 | ||
| 937 | 3251 | #. module: account | 3348 | #. module: account |
| 938 | 3349 | <<<<<<< TREE | ||
| 939 | 3252 | #: code:addons/account/account_invoice.py:791 | 3350 | #: code:addons/account/account_invoice.py:791 |
| 940 | 3351 | ======= | ||
| 941 | 3352 | #: code:addons/account/account_invoice.py:823 | ||
| 942 | 3353 | >>>>>>> MERGE-SOURCE | ||
| 943 | 3253 | #, python-format | 3354 | #, python-format |
| 944 | 3254 | msgid "" | 3355 | msgid "" |
| 945 | 3255 | "Tax base different!\n" | 3356 | "Tax base different!\n" |
| 946 | @@ -3412,8 +3513,13 @@ | |||
| 947 | 3412 | msgstr "عرض" | 3513 | msgstr "عرض" |
| 948 | 3413 | 3514 | ||
| 949 | 3414 | #. module: account | 3515 | #. module: account |
| 950 | 3516 | <<<<<<< TREE | ||
| 951 | 3415 | #: code:addons/account/account.py:3422 | 3517 | #: code:addons/account/account.py:3422 |
| 952 | 3416 | #: code:addons/account/account_bank.py:95 | 3518 | #: code:addons/account/account_bank.py:95 |
| 953 | 3519 | ======= | ||
| 954 | 3520 | #: code:addons/account/account.py:3460 | ||
| 955 | 3521 | #: code:addons/account/account_bank.py:94 | ||
| 956 | 3522 | >>>>>>> MERGE-SOURCE | ||
| 957 | 3417 | #, python-format | 3523 | #, python-format |
| 958 | 3418 | msgid "BNK" | 3524 | msgid "BNK" |
| 959 | 3419 | msgstr "بنك" | 3525 | msgstr "بنك" |
| 960 | @@ -3682,7 +3788,11 @@ | |||
| 961 | 3682 | "كإسم البيان. وهي تسمح لمدخلات البيان ان يكون لها نفس المراجع عن البيان نفسه." | 3788 | "كإسم البيان. وهي تسمح لمدخلات البيان ان يكون لها نفس المراجع عن البيان نفسه." |
| 962 | 3683 | 3789 | ||
| 963 | 3684 | #. module: account | 3790 | #. module: account |
| 964 | 3791 | <<<<<<< TREE | ||
| 965 | 3685 | #: code:addons/account/account_invoice.py:984 | 3792 | #: code:addons/account/account_invoice.py:984 |
| 966 | 3793 | ======= | ||
| 967 | 3794 | #: code:addons/account/account_invoice.py:1016 | ||
| 968 | 3795 | >>>>>>> MERGE-SOURCE | ||
| 969 | 3686 | #, python-format | 3796 | #, python-format |
| 970 | 3687 | msgid "" | 3797 | msgid "" |
| 971 | 3688 | "You cannot create an invoice on a centralized journal. Uncheck the " | 3798 | "You cannot create an invoice on a centralized journal. Uncheck the " |
| 972 | @@ -3697,7 +3807,11 @@ | |||
| 973 | 3697 | msgstr "رصيد أول المدة" | 3807 | msgstr "رصيد أول المدة" |
| 974 | 3698 | 3808 | ||
| 975 | 3699 | #. module: account | 3809 | #. module: account |
| 976 | 3810 | <<<<<<< TREE | ||
| 977 | 3700 | #: code:addons/account/account_invoice.py:1434 | 3811 | #: code:addons/account/account_invoice.py:1434 |
| 978 | 3812 | ======= | ||
| 979 | 3813 | #: code:addons/account/account_invoice.py:1465 | ||
| 980 | 3814 | >>>>>>> MERGE-SOURCE | ||
| 981 | 3701 | #, python-format | 3815 | #, python-format |
| 982 | 3702 | msgid "No Partner Defined !" | 3816 | msgid "No Partner Defined !" |
| 983 | 3703 | msgstr "لا يوجد شريك معرف !" | 3817 | msgstr "لا يوجد شريك معرف !" |
| 984 | @@ -3967,14 +4081,21 @@ | |||
| 985 | 3967 | msgstr "ضريبة الشراء هذه سيتم استخدامها افتراضيا للمنتجات الجديدة." | 4081 | msgstr "ضريبة الشراء هذه سيتم استخدامها افتراضيا للمنتجات الجديدة." |
| 986 | 3968 | 4082 | ||
| 987 | 3969 | #. module: account | 4083 | #. module: account |
| 988 | 4084 | <<<<<<< TREE | ||
| 989 | 3970 | #: report:account.invoice:0 | 4085 | #: report:account.invoice:0 |
| 990 | 3971 | msgid "VAT :" | 4086 | msgid "VAT :" |
| 991 | 3972 | msgstr "ضريبة القيمة المضافة:" | 4087 | msgstr "ضريبة القيمة المضافة:" |
| 992 | 3973 | 4088 | ||
| 993 | 3974 | #. module: account | 4089 | #. module: account |
| 994 | 4090 | ======= | ||
| 995 | 4091 | #: report:account.account.balance:0 | ||
| 996 | 4092 | >>>>>>> MERGE-SOURCE | ||
| 997 | 3975 | #: report:account.central.journal:0 | 4093 | #: report:account.central.journal:0 |
| 998 | 3976 | #: view:account.config.settings:0 | 4094 | #: view:account.config.settings:0 |
| 999 | 4095 | #: report:account.general.journal:0 | ||
| 1000 | 3977 | #: report:account.general.ledger:0 | 4096 | #: report:account.general.ledger:0 |
| 1001 | 4097 | #: report:account.general.ledger_landscape:0 | ||
| 1002 | 4098 | #: report:account.journal.period.print:0 | ||
| 1003 | 3978 | #: report:account.partner.balance:0 | 4099 | #: report:account.partner.balance:0 |
| 1004 | 3979 | #: report:account.third_party_ledger:0 | 4100 | #: report:account.third_party_ledger:0 |
| 1005 | 3980 | #: report:account.third_party_ledger_other:0 | 4101 | #: report:account.third_party_ledger_other:0 |
| 1006 | @@ -4340,7 +4461,11 @@ | |||
| 1007 | 4340 | msgstr "فرعي موحد" | 4461 | msgstr "فرعي موحد" |
| 1008 | 4341 | 4462 | ||
| 1009 | 4342 | #. module: account | 4463 | #. module: account |
| 1010 | 4464 | <<<<<<< TREE | ||
| 1011 | 4343 | #: code:addons/account/account_invoice.py:550 | 4465 | #: code:addons/account/account_invoice.py:550 |
| 1012 | 4466 | ======= | ||
| 1013 | 4467 | #: code:addons/account/account_invoice.py:573 | ||
| 1014 | 4468 | >>>>>>> MERGE-SOURCE | ||
| 1015 | 4344 | #: code:addons/account/wizard/account_invoice_refund.py:146 | 4469 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
| 1016 | 4345 | #, python-format | 4470 | #, python-format |
| 1017 | 4346 | msgid "Insufficient Data!" | 4471 | msgid "Insufficient Data!" |
| 1018 | @@ -4618,8 +4743,13 @@ | |||
| 1019 | 4618 | msgstr "تسلسل فاتورة المورد/الشريك" | 4743 | msgstr "تسلسل فاتورة المورد/الشريك" |
| 1020 | 4619 | 4744 | ||
| 1021 | 4620 | #. module: account | 4745 | #. module: account |
| 1022 | 4746 | <<<<<<< TREE | ||
| 1023 | 4621 | #: code:addons/account/account_invoice.py:583 | 4747 | #: code:addons/account/account_invoice.py:583 |
| 1024 | 4622 | #: code:addons/account/account_invoice.py:598 | 4748 | #: code:addons/account/account_invoice.py:598 |
| 1025 | 4749 | ======= | ||
| 1026 | 4750 | #: code:addons/account/account_invoice.py:610 | ||
| 1027 | 4751 | #: code:addons/account/account_invoice.py:625 | ||
| 1028 | 4752 | >>>>>>> MERGE-SOURCE | ||
| 1029 | 4623 | #, python-format | 4753 | #, python-format |
| 1030 | 4624 | msgid "" | 4754 | msgid "" |
| 1031 | 4625 | "Cannot find a chart of account, you should create one from Settings\\" | 4755 | "Cannot find a chart of account, you should create one from Settings\\" |
| 1032 | @@ -4897,7 +5027,11 @@ | |||
| 1033 | 4897 | msgstr "" | 5027 | msgstr "" |
| 1034 | 4898 | 5028 | ||
| 1035 | 4899 | #. module: account | 5029 | #. module: account |
| 1036 | 5030 | <<<<<<< TREE | ||
| 1037 | 4900 | #: code:addons/account/account_invoice.py:627 | 5031 | #: code:addons/account/account_invoice.py:627 |
| 1038 | 5032 | ======= | ||
| 1039 | 5033 | #: code:addons/account/account_invoice.py:658 | ||
| 1040 | 5034 | >>>>>>> MERGE-SOURCE | ||
| 1041 | 4901 | #, python-format | 5035 | #, python-format |
| 1042 | 4902 | msgid "" | 5036 | msgid "" |
| 1043 | 4903 | "Cannot find any account journal of %s type for this company.\n" | 5037 | "Cannot find any account journal of %s type for this company.\n" |
| 1044 | @@ -5227,7 +5361,11 @@ | |||
| 1045 | 5227 | msgstr "التطبيق الضريبي" | 5361 | msgstr "التطبيق الضريبي" |
| 1046 | 5228 | 5362 | ||
| 1047 | 5229 | #. module: account | 5363 | #. module: account |
| 1048 | 5364 | <<<<<<< TREE | ||
| 1049 | 5230 | #: code:addons/account/account_invoice.py:890 | 5365 | #: code:addons/account/account_invoice.py:890 |
| 1050 | 5366 | ======= | ||
| 1051 | 5367 | #: code:addons/account/account_invoice.py:922 | ||
| 1052 | 5368 | >>>>>>> MERGE-SOURCE | ||
| 1053 | 5231 | #, python-format | 5369 | #, python-format |
| 1054 | 5232 | msgid "" | 5370 | msgid "" |
| 1055 | 5233 | "Please verify the price of the invoice !\n" | 5371 | "Please verify the price of the invoice !\n" |
| 1056 | @@ -5563,7 +5701,11 @@ | |||
| 1057 | 5563 | msgstr "رمز الحساب (إذا كان النوع = الرمز)" | 5701 | msgstr "رمز الحساب (إذا كان النوع = الرمز)" |
| 1058 | 5564 | 5702 | ||
| 1059 | 5565 | #. module: account | 5703 | #. module: account |
| 1060 | 5704 | <<<<<<< TREE | ||
| 1061 | 5566 | #: code:addons/account/account_invoice.py:485 | 5705 | #: code:addons/account/account_invoice.py:485 |
| 1062 | 5706 | ======= | ||
| 1063 | 5707 | #: code:addons/account/account_invoice.py:508 | ||
| 1064 | 5708 | >>>>>>> MERGE-SOURCE | ||
| 1065 | 5567 | #, python-format | 5709 | #, python-format |
| 1066 | 5568 | msgid "" | 5710 | msgid "" |
| 1067 | 5569 | "Cannot find a chart of accounts for this company, you should create one." | 5711 | "Cannot find a chart of accounts for this company, you should create one." |
| 1068 | @@ -5955,6 +6097,18 @@ | |||
| 1069 | 5955 | msgstr "" | 6097 | msgstr "" |
| 1070 | 5956 | 6098 | ||
| 1071 | 5957 | #. module: account | 6099 | #. module: account |
| 1072 | 6100 | <<<<<<< TREE | ||
| 1073 | 6101 | ======= | ||
| 1074 | 6102 | #: code:addons/account/account_invoice.py:474 | ||
| 1075 | 6103 | #, python-format | ||
| 1076 | 6104 | msgid "" | ||
| 1077 | 6105 | "You cannot delete an invoice after it has been validated (and received a " | ||
| 1078 | 6106 | "number). You can set it back to \"Draft\" state and modify its content, " | ||
| 1079 | 6107 | "then re-confirm it." | ||
| 1080 | 6108 | msgstr "" | ||
| 1081 | 6109 | |||
| 1082 | 6110 | #. module: account | ||
| 1083 | 6111 | >>>>>>> MERGE-SOURCE | ||
| 1084 | 5958 | #: help:account.automatic.reconcile,power:0 | 6112 | #: help:account.automatic.reconcile,power:0 |
| 1085 | 5959 | msgid "" | 6113 | msgid "" |
| 1086 | 5960 | "Number of partial amounts that can be combined to find a balance point can " | 6114 | "Number of partial amounts that can be combined to find a balance point can " |
| 1087 | @@ -6108,7 +6262,11 @@ | |||
| 1088 | 6108 | #: view:account.config.settings:0 | 6262 | #: view:account.config.settings:0 |
| 1089 | 6109 | #: view:account.invoice:0 | 6263 | #: view:account.invoice:0 |
| 1090 | 6110 | #: view:account.invoice.report:0 | 6264 | #: view:account.invoice.report:0 |
| 1091 | 6265 | <<<<<<< TREE | ||
| 1092 | 6111 | #: code:addons/account/account_invoice.py:355 | 6266 | #: code:addons/account/account_invoice.py:355 |
| 1093 | 6267 | ======= | ||
| 1094 | 6268 | #: code:addons/account/account_invoice.py:390 | ||
| 1095 | 6269 | >>>>>>> MERGE-SOURCE | ||
| 1096 | 6112 | #, python-format | 6270 | #, python-format |
| 1097 | 6113 | msgid "Supplier" | 6271 | msgid "Supplier" |
| 1098 | 6114 | msgstr "مورِّد" | 6272 | msgstr "مورِّد" |
| 1099 | @@ -6128,7 +6286,7 @@ | |||
| 1100 | 6128 | msgstr "الحساب" | 6286 | msgstr "الحساب" |
| 1101 | 6129 | 6287 | ||
| 1102 | 6130 | #. module: account | 6288 | #. module: account |
| 1104 | 6131 | #: code:addons/account/account_invoice.py:92 | 6289 | #: code:addons/account/account_invoice.py:95 |
| 1105 | 6132 | #, python-format | 6290 | #, python-format |
| 1106 | 6133 | msgid "Free Reference" | 6291 | msgid "Free Reference" |
| 1107 | 6134 | msgstr "مرجع حر" | 6292 | msgstr "مرجع حر" |
| 1108 | @@ -6138,7 +6296,9 @@ | |||
| 1109 | 6138 | #: selection:account.common.partner.report,result_selection:0 | 6296 | #: selection:account.common.partner.report,result_selection:0 |
| 1110 | 6139 | #: selection:account.partner.balance,result_selection:0 | 6297 | #: selection:account.partner.balance,result_selection:0 |
| 1111 | 6140 | #: selection:account.partner.ledger,result_selection:0 | 6298 | #: selection:account.partner.ledger,result_selection:0 |
| 1112 | 6299 | #: report:account.third_party_ledger:0 | ||
| 1113 | 6141 | #: code:addons/account/report/account_partner_balance.py:301 | 6300 | #: code:addons/account/report/account_partner_balance.py:301 |
| 1114 | 6301 | #: code:addons/account/report/account_partner_ledger.py:276 | ||
| 1115 | 6142 | #, python-format | 6302 | #, python-format |
| 1116 | 6143 | msgid "Receivable and Payable Accounts" | 6303 | msgid "Receivable and Payable Accounts" |
| 1117 | 6144 | msgstr "حسابات الدائنون و المدينون" | 6304 | msgstr "حسابات الدائنون و المدينون" |
| 1118 | @@ -6442,7 +6602,11 @@ | |||
| 1119 | 6442 | msgstr "" | 6602 | msgstr "" |
| 1120 | 6443 | 6603 | ||
| 1121 | 6444 | #. module: account | 6604 | #. module: account |
| 1122 | 6605 | <<<<<<< TREE | ||
| 1123 | 6445 | #: code:addons/account/account_invoice.py:1091 | 6606 | #: code:addons/account/account_invoice.py:1091 |
| 1124 | 6607 | ======= | ||
| 1125 | 6608 | #: code:addons/account/account_invoice.py:1124 | ||
| 1126 | 6609 | >>>>>>> MERGE-SOURCE | ||
| 1127 | 6446 | #, python-format | 6610 | #, python-format |
| 1128 | 6447 | msgid "" | 6611 | msgid "" |
| 1129 | 6448 | "You cannot cancel an invoice which is partially paid. You need to " | 6612 | "You cannot cancel an invoice which is partially paid. You need to " |
| 1130 | @@ -6619,7 +6783,11 @@ | |||
| 1131 | 6619 | msgstr "لا يمكنك إنشاء يومية أصناف لحساب مغلق." | 6783 | msgstr "لا يمكنك إنشاء يومية أصناف لحساب مغلق." |
| 1132 | 6620 | 6784 | ||
| 1133 | 6621 | #. module: account | 6785 | #. module: account |
| 1134 | 6786 | <<<<<<< TREE | ||
| 1135 | 6622 | #: code:addons/account/account_invoice.py:606 | 6787 | #: code:addons/account/account_invoice.py:606 |
| 1136 | 6788 | ======= | ||
| 1137 | 6789 | #: code:addons/account/account_invoice.py:633 | ||
| 1138 | 6790 | >>>>>>> MERGE-SOURCE | ||
| 1139 | 6623 | #, python-format | 6791 | #, python-format |
| 1140 | 6624 | msgid "Invoice line account's company and invoice's compnay does not match." | 6792 | msgid "Invoice line account's company and invoice's compnay does not match." |
| 1141 | 6625 | msgstr "" | 6793 | msgstr "" |
| 1142 | @@ -6769,12 +6937,21 @@ | |||
| 1143 | 6769 | "الحالة، ترتيب التقييم يصبح مهمًا." | 6937 | "الحالة، ترتيب التقييم يصبح مهمًا." |
| 1144 | 6770 | 6938 | ||
| 1145 | 6771 | #. module: account | 6939 | #. module: account |
| 1146 | 6940 | <<<<<<< TREE | ||
| 1147 | 6772 | #: code:addons/account/account.py:1410 | 6941 | #: code:addons/account/account.py:1410 |
| 1148 | 6773 | #: code:addons/account/account.py:1415 | 6942 | #: code:addons/account/account.py:1415 |
| 1149 | 6774 | #: code:addons/account/account.py:1444 | 6943 | #: code:addons/account/account.py:1444 |
| 1150 | 6775 | #: code:addons/account/account.py:1451 | 6944 | #: code:addons/account/account.py:1451 |
| 1151 | 6776 | #: code:addons/account/account_invoice.py:983 | 6945 | #: code:addons/account/account_invoice.py:983 |
| 1152 | 6777 | #: code:addons/account/account_move_line.py:1008 | 6946 | #: code:addons/account/account_move_line.py:1008 |
| 1153 | 6947 | ======= | ||
| 1154 | 6948 | #: code:addons/account/account.py:1448 | ||
| 1155 | 6949 | #: code:addons/account/account.py:1453 | ||
| 1156 | 6950 | #: code:addons/account/account.py:1482 | ||
| 1157 | 6951 | #: code:addons/account/account.py:1489 | ||
| 1158 | 6952 | #: code:addons/account/account_invoice.py:1015 | ||
| 1159 | 6953 | #: code:addons/account/account_move_line.py:1005 | ||
| 1160 | 6954 | >>>>>>> MERGE-SOURCE | ||
| 1161 | 6778 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 | 6955 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
| 1162 | 6779 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 | 6956 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
| 1163 | 6780 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 | 6957 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
| 1164 | @@ -6858,6 +7035,10 @@ | |||
| 1165 | 6858 | #: report:account.invoice:0 | 7035 | #: report:account.invoice:0 |
| 1166 | 6859 | #: selection:account.invoice,type:0 | 7036 | #: selection:account.invoice,type:0 |
| 1167 | 6860 | #: selection:account.invoice.report,type:0 | 7037 | #: selection:account.invoice.report,type:0 |
| 1168 | 7038 | <<<<<<< TREE | ||
| 1169 | 7039 | ======= | ||
| 1170 | 7040 | #: code:addons/account/account_invoice.py:1160 | ||
| 1171 | 7041 | >>>>>>> MERGE-SOURCE | ||
| 1172 | 6861 | #: selection:report.invoice.created,type:0 | 7042 | #: selection:report.invoice.created,type:0 |
| 1173 | 6862 | msgid "Supplier Refund" | 7043 | msgid "Supplier Refund" |
| 1174 | 6863 | msgstr "رد للمورد" | 7044 | msgstr "رد للمورد" |
| 1175 | @@ -8012,7 +8193,11 @@ | |||
| 1176 | 8012 | msgstr "مايو" | 8193 | msgstr "مايو" |
| 1177 | 8013 | 8194 | ||
| 1178 | 8014 | #. module: account | 8195 | #. module: account |
| 1179 | 8196 | <<<<<<< TREE | ||
| 1180 | 8015 | #: code:addons/account/account_invoice.py:788 | 8197 | #: code:addons/account/account_invoice.py:788 |
| 1181 | 8198 | ======= | ||
| 1182 | 8199 | #: code:addons/account/account_invoice.py:820 | ||
| 1183 | 8200 | >>>>>>> MERGE-SOURCE | ||
| 1184 | 8016 | #, python-format | 8201 | #, python-format |
| 1185 | 8017 | msgid "Global taxes defined, but they are not in invoice lines !" | 8202 | msgid "Global taxes defined, but they are not in invoice lines !" |
| 1186 | 8018 | msgstr "الضرائب العلميه المحدده لكنها لا تكون في اسطر الفاتوره" | 8203 | msgstr "الضرائب العلميه المحدده لكنها لا تكون في اسطر الفاتوره" |
| 1187 | @@ -8053,7 +8238,11 @@ | |||
| 1188 | 8053 | #: view:account.config.settings:0 | 8238 | #: view:account.config.settings:0 |
| 1189 | 8054 | #: view:account.invoice:0 | 8239 | #: view:account.invoice:0 |
| 1190 | 8055 | #: view:account.invoice.report:0 | 8240 | #: view:account.invoice.report:0 |
| 1191 | 8241 | <<<<<<< TREE | ||
| 1192 | 8056 | #: code:addons/account/account_invoice.py:353 | 8242 | #: code:addons/account/account_invoice.py:353 |
| 1193 | 8243 | ======= | ||
| 1194 | 8244 | #: code:addons/account/account_invoice.py:388 | ||
| 1195 | 8245 | >>>>>>> MERGE-SOURCE | ||
| 1196 | 8057 | #, python-format | 8246 | #, python-format |
| 1197 | 8058 | msgid "Customer" | 8247 | msgid "Customer" |
| 1198 | 8059 | msgstr "العميل" | 8248 | msgstr "العميل" |
| 1199 | @@ -8192,6 +8381,17 @@ | |||
| 1200 | 8192 | msgstr "معاملات التسوية" | 8381 | msgstr "معاملات التسوية" |
| 1201 | 8193 | 8382 | ||
| 1202 | 8194 | #. module: account | 8383 | #. module: account |
| 1203 | 8384 | <<<<<<< TREE | ||
| 1204 | 8385 | ======= | ||
| 1205 | 8386 | #: code:addons/account/account_invoice.py:472 | ||
| 1206 | 8387 | #, python-format | ||
| 1207 | 8388 | msgid "" | ||
| 1208 | 8389 | "You cannot delete an invoice which is not draft or cancelled. You should " | ||
| 1209 | 8390 | "refund it instead." | ||
| 1210 | 8391 | msgstr "" | ||
| 1211 | 8392 | |||
| 1212 | 8393 | #. module: account | ||
| 1213 | 8394 | >>>>>>> MERGE-SOURCE | ||
| 1214 | 8195 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement | 8395 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
| 1215 | 8196 | msgid "Legal Reports" | 8396 | msgid "Legal Reports" |
| 1216 | 8197 | msgstr "تقارير قانونية" | 8397 | msgstr "تقارير قانونية" |
| 1217 | @@ -8308,7 +8508,11 @@ | |||
| 1218 | 8308 | msgstr "اختر عملة للفاتورة" | 8508 | msgstr "اختر عملة للفاتورة" |
| 1219 | 8309 | 8509 | ||
| 1220 | 8310 | #. module: account | 8510 | #. module: account |
| 1221 | 8511 | <<<<<<< TREE | ||
| 1222 | 8311 | #: code:addons/account/account_invoice.py:869 | 8512 | #: code:addons/account/account_invoice.py:869 |
| 1223 | 8513 | ======= | ||
| 1224 | 8514 | #: code:addons/account/account_invoice.py:901 | ||
| 1225 | 8515 | >>>>>>> MERGE-SOURCE | ||
| 1226 | 8312 | #, python-format | 8516 | #, python-format |
| 1227 | 8313 | msgid "No Invoice Lines !" | 8517 | msgid "No Invoice Lines !" |
| 1228 | 8314 | msgstr "لا سطور للفاتورة !" | 8518 | msgstr "لا سطور للفاتورة !" |
| 1229 | @@ -8384,7 +8588,11 @@ | |||
| 1230 | 8384 | msgstr "شريك متحد" | 8588 | msgstr "شريك متحد" |
| 1231 | 8385 | 8589 | ||
| 1232 | 8386 | #. module: account | 8590 | #. module: account |
| 1233 | 8591 | <<<<<<< TREE | ||
| 1234 | 8387 | #: code:addons/account/account_invoice.py:1434 | 8592 | #: code:addons/account/account_invoice.py:1434 |
| 1235 | 8593 | ======= | ||
| 1236 | 8594 | #: code:addons/account/account_invoice.py:1465 | ||
| 1237 | 8595 | >>>>>>> MERGE-SOURCE | ||
| 1238 | 8388 | #, python-format | 8596 | #, python-format |
| 1239 | 8389 | msgid "You must first select a partner !" | 8597 | msgid "You must first select a partner !" |
| 1240 | 8390 | msgstr "يجب عليك اولاً اختيار شريك !" | 8598 | msgstr "يجب عليك اولاً اختيار شريك !" |
| 1241 | @@ -9342,7 +9550,11 @@ | |||
| 1242 | 9342 | msgstr "ضريبة المشتريات (%)" | 9550 | msgstr "ضريبة المشتريات (%)" |
| 1243 | 9343 | 9551 | ||
| 1244 | 9344 | #. module: account | 9552 | #. module: account |
| 1245 | 9553 | <<<<<<< TREE | ||
| 1246 | 9345 | #: code:addons/account/account_invoice.py:869 | 9554 | #: code:addons/account/account_invoice.py:869 |
| 1247 | 9555 | ======= | ||
| 1248 | 9556 | #: code:addons/account/account_invoice.py:901 | ||
| 1249 | 9557 | >>>>>>> MERGE-SOURCE | ||
| 1250 | 9346 | #, python-format | 9558 | #, python-format |
| 1251 | 9347 | msgid "Please create some invoice lines." | 9559 | msgid "Please create some invoice lines." |
| 1252 | 9348 | msgstr "قم بإنشاء سطور للفاتورة." | 9560 | msgstr "قم بإنشاء سطور للفاتورة." |
| 1253 | @@ -9906,7 +10118,11 @@ | |||
| 1254 | 9906 | msgstr "غير مسوي" | 10118 | msgstr "غير مسوي" |
| 1255 | 9907 | 10119 | ||
| 1256 | 9908 | #. module: account | 10120 | #. module: account |
| 1257 | 10121 | <<<<<<< TREE | ||
| 1258 | 9909 | #: code:addons/account/account_invoice.py:890 | 10122 | #: code:addons/account/account_invoice.py:890 |
| 1259 | 10123 | ======= | ||
| 1260 | 10124 | #: code:addons/account/account_invoice.py:922 | ||
| 1261 | 10125 | >>>>>>> MERGE-SOURCE | ||
| 1262 | 9910 | #, python-format | 10126 | #, python-format |
| 1263 | 9911 | msgid "Bad total !" | 10127 | msgid "Bad total !" |
| 1264 | 9912 | msgstr "إجمالي سئ!" | 10128 | msgstr "إجمالي سئ!" |
| 1265 | @@ -10386,6 +10602,7 @@ | |||
| 1266 | 10386 | 10602 | ||
| 1267 | 10387 | #. module: account | 10603 | #. module: account |
| 1268 | 10388 | #: field:account.account,company_id:0 | 10604 | #: field:account.account,company_id:0 |
| 1269 | 10605 | #: report:account.account.balance:0 | ||
| 1270 | 10389 | #: field:account.aged.trial.balance,company_id:0 | 10606 | #: field:account.aged.trial.balance,company_id:0 |
| 1271 | 10390 | #: field:account.analytic.journal,company_id:0 | 10607 | #: field:account.analytic.journal,company_id:0 |
| 1272 | 10391 | #: field:account.balance.report,company_id:0 | 10608 | #: field:account.balance.report,company_id:0 |
| 1273 | @@ -10401,7 +10618,9 @@ | |||
| 1274 | 10401 | #: field:account.entries.report,company_id:0 | 10618 | #: field:account.entries.report,company_id:0 |
| 1275 | 10402 | #: field:account.fiscal.position,company_id:0 | 10619 | #: field:account.fiscal.position,company_id:0 |
| 1276 | 10403 | #: field:account.fiscalyear,company_id:0 | 10620 | #: field:account.fiscalyear,company_id:0 |
| 1277 | 10621 | #: report:account.general.journal:0 | ||
| 1278 | 10404 | #: field:account.general.journal,company_id:0 | 10622 | #: field:account.general.journal,company_id:0 |
| 1279 | 10623 | #: report:account.general.ledger_landscape:0 | ||
| 1280 | 10405 | #: field:account.installer,company_id:0 | 10624 | #: field:account.installer,company_id:0 |
| 1281 | 10406 | #: field:account.invoice,company_id:0 | 10625 | #: field:account.invoice,company_id:0 |
| 1282 | 10407 | #: field:account.invoice.line,company_id:0 | 10626 | #: field:account.invoice.line,company_id:0 |
| 1283 | @@ -10410,6 +10629,7 @@ | |||
| 1284 | 10410 | #: field:account.invoice.tax,company_id:0 | 10629 | #: field:account.invoice.tax,company_id:0 |
| 1285 | 10411 | #: field:account.journal,company_id:0 | 10630 | #: field:account.journal,company_id:0 |
| 1286 | 10412 | #: field:account.journal.period,company_id:0 | 10631 | #: field:account.journal.period,company_id:0 |
| 1287 | 10632 | #: report:account.journal.period.print:0 | ||
| 1288 | 10413 | #: field:account.model,company_id:0 | 10633 | #: field:account.model,company_id:0 |
| 1289 | 10414 | #: field:account.move,company_id:0 | 10634 | #: field:account.move,company_id:0 |
| 1290 | 10415 | #: field:account.move.line,company_id:0 | 10635 | #: field:account.move.line,company_id:0 |
| 1291 | @@ -10572,6 +10792,10 @@ | |||
| 1292 | 10572 | #: view:account.invoice:0 | 10792 | #: view:account.invoice:0 |
| 1293 | 10573 | #: selection:account.invoice,type:0 | 10793 | #: selection:account.invoice,type:0 |
| 1294 | 10574 | #: selection:account.invoice.report,type:0 | 10794 | #: selection:account.invoice.report,type:0 |
| 1295 | 10795 | <<<<<<< TREE | ||
| 1296 | 10796 | ======= | ||
| 1297 | 10797 | #: code:addons/account/account_invoice.py:1158 | ||
| 1298 | 10798 | >>>>>>> MERGE-SOURCE | ||
| 1299 | 10575 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 | 10799 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
| 1300 | 10576 | #: selection:report.invoice.created,type:0 | 10800 | #: selection:report.invoice.created,type:0 |
| 1301 | 10577 | msgid "Supplier Invoice" | 10801 | msgid "Supplier Invoice" |
| 1302 | @@ -10659,8 +10883,10 @@ | |||
| 1303 | 10659 | msgstr "" | 10883 | msgstr "" |
| 1304 | 10660 | 10884 | ||
| 1305 | 10661 | #. module: account | 10885 | #. module: account |
| 1306 | 10886 | #: report:account.account.balance:0 | ||
| 1307 | 10662 | #: selection:account.balance.report,display_account:0 | 10887 | #: selection:account.balance.report,display_account:0 |
| 1308 | 10663 | #: selection:account.common.account.report,display_account:0 | 10888 | #: selection:account.common.account.report,display_account:0 |
| 1309 | 10889 | #: report:account.general.ledger_landscape:0 | ||
| 1310 | 10664 | #: selection:account.report.general.ledger,display_account:0 | 10890 | #: selection:account.report.general.ledger,display_account:0 |
| 1311 | 10665 | msgid "With movements" | 10891 | msgid "With movements" |
| 1312 | 10666 | msgstr "مع حركات" | 10892 | msgstr "مع حركات" |
| 1313 | @@ -10755,7 +10981,11 @@ | |||
| 1314 | 10755 | msgstr "قيود يوميه مصنفه حسب" | 10981 | msgstr "قيود يوميه مصنفه حسب" |
| 1315 | 10756 | 10982 | ||
| 1316 | 10757 | #. module: account | 10983 | #. module: account |
| 1317 | 10984 | <<<<<<< TREE | ||
| 1318 | 10758 | #: code:addons/account/account_invoice.py:1515 | 10985 | #: code:addons/account/account_invoice.py:1515 |
| 1319 | 10986 | ======= | ||
| 1320 | 10987 | #: code:addons/account/account_invoice.py:1546 | ||
| 1321 | 10988 | >>>>>>> MERGE-SOURCE | ||
| 1322 | 10759 | #, python-format | 10989 | #, python-format |
| 1323 | 10760 | msgid "" | 10990 | msgid "" |
| 1324 | 10761 | "The selected unit of measure is not compatible with the unit of measure of " | 10991 | "The selected unit of measure is not compatible with the unit of measure of " |
| 1325 | @@ -10836,6 +11066,11 @@ | |||
| 1326 | 10836 | #: report:account.invoice:0 | 11066 | #: report:account.invoice:0 |
| 1327 | 10837 | #: view:account.invoice:0 | 11067 | #: view:account.invoice:0 |
| 1328 | 10838 | #: view:account.invoice.report:0 | 11068 | #: view:account.invoice.report:0 |
| 1329 | 11069 | <<<<<<< TREE | ||
| 1330 | 11070 | ======= | ||
| 1331 | 11071 | #: code:addons/account/account_invoice.py:1159 | ||
| 1332 | 11072 | #, python-format | ||
| 1333 | 11073 | >>>>>>> MERGE-SOURCE | ||
| 1334 | 10839 | msgid "Refund" | 11074 | msgid "Refund" |
| 1335 | 10840 | msgstr "رد" | 11075 | msgstr "رد" |
| 1336 | 10841 | 11076 | ||
| 1337 | @@ -10906,7 +11141,11 @@ | |||
| 1338 | 10906 | msgstr "ضرائب الفاتورة يدوياً" | 11141 | msgstr "ضرائب الفاتورة يدوياً" |
| 1339 | 10907 | 11142 | ||
| 1340 | 10908 | #. module: account | 11143 | #. module: account |
| 1341 | 11144 | <<<<<<< TREE | ||
| 1342 | 10909 | #: code:addons/account/account_invoice.py:550 | 11145 | #: code:addons/account/account_invoice.py:550 |
| 1343 | 11146 | ======= | ||
| 1344 | 11147 | #: code:addons/account/account_invoice.py:573 | ||
| 1345 | 11148 | >>>>>>> MERGE-SOURCE | ||
| 1346 | 10910 | #, python-format | 11149 | #, python-format |
| 1347 | 10911 | msgid "The payment term of supplier does not have a payment term line." | 11150 | msgid "The payment term of supplier does not have a payment term line." |
| 1348 | 10912 | msgstr "لا يوجد شروط دفع للمورد في خانة شروط الدفع" | 11151 | msgstr "لا يوجد شروط دفع للمورد في خانة شروط الدفع" |
| 1349 | 10913 | 11152 | ||
| 1350 | === modified file 'account/i18n/bg.po' | |||
| 1351 | --- account/i18n/bg.po 2013-06-13 18:15:03 +0000 | |||
| 1352 | +++ account/i18n/bg.po 2013-06-19 09:20:00 +0000 | |||
| 1353 | @@ -4,17 +4,31 @@ | |||
| 1354 | 4 | # | 4 | # |
| 1355 | 5 | msgid "" | 5 | msgid "" |
| 1356 | 6 | msgstr "" | 6 | msgstr "" |
| 1357 | 7 | <<<<<<< TREE | ||
| 1358 | 7 | "Project-Id-Version: OpenERP Server 6.0dev\n" | 8 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
| 1359 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
| 1360 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
| 1361 | 10 | "PO-Revision-Date: 2012-05-10 17:28+0000\n" | 11 | "PO-Revision-Date: 2012-05-10 17:28+0000\n" |
| 1362 | 11 | "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n" | 12 | "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n" |
| 1363 | 12 | "Language-Team: \n" | 13 | "Language-Team: \n" |
| 1364 | 14 | ======= | ||
| 1365 | 15 | "Project-Id-Version: openobject-addons\n" | ||
| 1366 | 16 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 1367 | 17 | "POT-Creation-Date: 2013-06-14 22:29+0000\n" | ||
| 1368 | 18 | "PO-Revision-Date: 2012-12-21 23:00+0000\n" | ||
| 1369 | 19 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 1370 | 20 | "Language-Team: Bulgarian <bg@li.org>\n" | ||
| 1371 | 21 | >>>>>>> MERGE-SOURCE | ||
| 1372 | 13 | "MIME-Version: 1.0\n" | 22 | "MIME-Version: 1.0\n" |
| 1373 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 23 | "Content-Type: text/plain; charset=UTF-8\n" |
| 1374 | 15 | "Content-Transfer-Encoding: 8bit\n" | 24 | "Content-Transfer-Encoding: 8bit\n" |
| 1375 | 25 | <<<<<<< TREE | ||
| 1376 | 16 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" | 26 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" |
| 1377 | 17 | "X-Generator: Launchpad (build 16532)\n" | 27 | "X-Generator: Launchpad (build 16532)\n" |
| 1378 | 28 | ======= | ||
| 1379 | 29 | "X-Launchpad-Export-Date: 2013-06-15 06:14+0000\n" | ||
| 1380 | 30 | "X-Generator: Launchpad (build 16667)\n" | ||
| 1381 | 31 | >>>>>>> MERGE-SOURCE | ||
| 1382 | 18 | 32 | ||
| 1383 | 19 | #. module: account | 33 | #. module: account |
| 1384 | 20 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 | 34 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
| 1385 | @@ -131,11 +145,19 @@ | |||
| 1386 | 131 | #: code:addons/account/account.py:641 | 145 | #: code:addons/account/account.py:641 |
| 1387 | 132 | #: code:addons/account/account.py:686 | 146 | #: code:addons/account/account.py:686 |
| 1388 | 133 | #: code:addons/account/account.py:781 | 147 | #: code:addons/account/account.py:781 |
| 1389 | 148 | <<<<<<< TREE | ||
| 1390 | 134 | #: code:addons/account/account.py:1049 | 149 | #: code:addons/account/account.py:1049 |
| 1391 | 135 | #: code:addons/account/account_invoice.py:788 | 150 | #: code:addons/account/account_invoice.py:788 |
| 1392 | 136 | #: code:addons/account/account_invoice.py:791 | 151 | #: code:addons/account/account_invoice.py:791 |
| 1393 | 137 | #: code:addons/account/account_invoice.py:794 | 152 | #: code:addons/account/account_invoice.py:794 |
| 1394 | 138 | #: code:addons/account/account_invoice.py:1514 | 153 | #: code:addons/account/account_invoice.py:1514 |
| 1395 | 154 | ======= | ||
| 1396 | 155 | #: code:addons/account/account.py:1058 | ||
| 1397 | 156 | #: code:addons/account/account_invoice.py:820 | ||
| 1398 | 157 | #: code:addons/account/account_invoice.py:823 | ||
| 1399 | 158 | #: code:addons/account/account_invoice.py:826 | ||
| 1400 | 159 | #: code:addons/account/account_invoice.py:1545 | ||
| 1401 | 160 | >>>>>>> MERGE-SOURCE | ||
| 1402 | 139 | #: code:addons/account/account_move_line.py:98 | 161 | #: code:addons/account/account_move_line.py:98 |
| 1403 | 140 | #: code:addons/account/account_move_line.py:774 | 162 | #: code:addons/account/account_move_line.py:774 |
| 1404 | 141 | #: code:addons/account/account_move_line.py:827 | 163 | #: code:addons/account/account_move_line.py:827 |
| 1405 | @@ -345,7 +367,7 @@ | |||
| 1406 | 345 | msgstr "" | 367 | msgstr "" |
| 1407 | 346 | 368 | ||
| 1408 | 347 | #. module: account | 369 | #. module: account |
| 1410 | 348 | #: code:addons/account/account_invoice.py:74 | 370 | #: code:addons/account/account_invoice.py:77 |
| 1411 | 349 | #, python-format | 371 | #, python-format |
| 1412 | 350 | msgid "You must define an analytic journal of type '%s'!" | 372 | msgid "You must define an analytic journal of type '%s'!" |
| 1413 | 351 | msgstr "" | 373 | msgstr "" |
| 1414 | @@ -601,11 +623,23 @@ | |||
| 1415 | 601 | msgstr "Счетоводителят потвърждава декларацията." | 623 | msgstr "Счетоводителят потвърждава декларацията." |
| 1416 | 602 | 624 | ||
| 1417 | 603 | #. module: account | 625 | #. module: account |
| 1418 | 626 | <<<<<<< TREE | ||
| 1419 | 604 | #. openerp-web | 627 | #. openerp-web |
| 1420 | 605 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 | 628 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
| 1421 | 606 | #, python-format | 629 | #, python-format |
| 1422 | 607 | msgid "Nothing to reconcile" | 630 | msgid "Nothing to reconcile" |
| 1423 | 608 | msgstr "" | 631 | msgstr "" |
| 1424 | 632 | ======= | ||
| 1425 | 633 | #: report:account.account.balance:0 | ||
| 1426 | 634 | #: selection:account.balance.report,display_account:0 | ||
| 1427 | 635 | #: selection:account.common.account.report,display_account:0 | ||
| 1428 | 636 | #: report:account.general.ledger_landscape:0 | ||
| 1429 | 637 | #: selection:account.report.general.ledger,display_account:0 | ||
| 1430 | 638 | #: selection:account.tax,type_tax_use:0 | ||
| 1431 | 639 | #: selection:account.tax.template,type_tax_use:0 | ||
| 1432 | 640 | msgid "All" | ||
| 1433 | 641 | msgstr "Всички" | ||
| 1434 | 642 | >>>>>>> MERGE-SOURCE | ||
| 1435 | 609 | 643 | ||
| 1436 | 610 | #. module: account | 644 | #. module: account |
| 1437 | 611 | #: field:account.config.settings,decimal_precision:0 | 645 | #: field:account.config.settings,decimal_precision:0 |
| 1438 | @@ -736,7 +770,9 @@ | |||
| 1439 | 736 | #: selection:account.common.partner.report,result_selection:0 | 770 | #: selection:account.common.partner.report,result_selection:0 |
| 1440 | 737 | #: selection:account.partner.balance,result_selection:0 | 771 | #: selection:account.partner.balance,result_selection:0 |
| 1441 | 738 | #: selection:account.partner.ledger,result_selection:0 | 772 | #: selection:account.partner.ledger,result_selection:0 |
| 1442 | 773 | #: report:account.third_party_ledger:0 | ||
| 1443 | 739 | #: code:addons/account/report/account_partner_balance.py:297 | 774 | #: code:addons/account/report/account_partner_balance.py:297 |
| 1444 | 775 | #: code:addons/account/report/account_partner_ledger.py:272 | ||
| 1445 | 740 | #, python-format | 776 | #, python-format |
| 1446 | 741 | msgid "Receivable Accounts" | 777 | msgid "Receivable Accounts" |
| 1447 | 742 | msgstr "Приходни сметки" | 778 | msgstr "Приходни сметки" |
| 1448 | @@ -776,7 +812,11 @@ | |||
| 1449 | 776 | msgstr "Сигурни ли сте че искате да създадете записи?" | 812 | msgstr "Сигурни ли сте че искате да създадете записи?" |
| 1450 | 777 | 813 | ||
| 1451 | 778 | #. module: account | 814 | #. module: account |
| 1452 | 815 | <<<<<<< TREE | ||
| 1453 | 779 | #: code:addons/account/account_invoice.py:1330 | 816 | #: code:addons/account/account_invoice.py:1330 |
| 1454 | 817 | ======= | ||
| 1455 | 818 | #: code:addons/account/account_invoice.py:1361 | ||
| 1456 | 819 | >>>>>>> MERGE-SOURCE | ||
| 1457 | 780 | #, python-format | 820 | #, python-format |
| 1458 | 781 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." | 821 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
| 1459 | 782 | msgstr "" | 822 | msgstr "" |
| 1460 | @@ -845,7 +885,11 @@ | |||
| 1461 | 845 | msgstr "Тип" | 885 | msgstr "Тип" |
| 1462 | 846 | 886 | ||
| 1463 | 847 | #. module: account | 887 | #. module: account |
| 1464 | 888 | <<<<<<< TREE | ||
| 1465 | 848 | #: code:addons/account/account_invoice.py:794 | 889 | #: code:addons/account/account_invoice.py:794 |
| 1466 | 890 | ======= | ||
| 1467 | 891 | #: code:addons/account/account_invoice.py:826 | ||
| 1468 | 892 | >>>>>>> MERGE-SOURCE | ||
| 1469 | 849 | #, python-format | 893 | #, python-format |
| 1470 | 850 | msgid "" | 894 | msgid "" |
| 1471 | 851 | "Taxes are missing!\n" | 895 | "Taxes are missing!\n" |
| 1472 | @@ -1027,7 +1071,11 @@ | |||
| 1473 | 1027 | msgstr "Пасив" | 1071 | msgstr "Пасив" |
| 1474 | 1028 | 1072 | ||
| 1475 | 1029 | #. module: account | 1073 | #. module: account |
| 1476 | 1074 | <<<<<<< TREE | ||
| 1477 | 1030 | #: code:addons/account/account_invoice.py:867 | 1075 | #: code:addons/account/account_invoice.py:867 |
| 1478 | 1076 | ======= | ||
| 1479 | 1077 | #: code:addons/account/account_invoice.py:899 | ||
| 1480 | 1078 | >>>>>>> MERGE-SOURCE | ||
| 1481 | 1031 | #, python-format | 1079 | #, python-format |
| 1482 | 1032 | msgid "Please define sequence on the journal related to this invoice." | 1080 | msgid "Please define sequence on the journal related to this invoice." |
| 1483 | 1033 | msgstr "" | 1081 | msgstr "" |
| 1484 | @@ -1098,10 +1146,17 @@ | |||
| 1485 | 1098 | msgstr "" | 1146 | msgstr "" |
| 1486 | 1099 | 1147 | ||
| 1487 | 1100 | #. module: account | 1148 | #. module: account |
| 1488 | 1149 | <<<<<<< TREE | ||
| 1489 | 1101 | #: code:addons/account/account.py:2308 | 1150 | #: code:addons/account/account.py:2308 |
| 1490 | 1102 | #: code:addons/account/account_bank_statement.py:423 | 1151 | #: code:addons/account/account_bank_statement.py:423 |
| 1491 | 1103 | #: code:addons/account/account_invoice.py:74 | 1152 | #: code:addons/account/account_invoice.py:74 |
| 1492 | 1104 | #: code:addons/account/account_invoice.py:744 | 1153 | #: code:addons/account/account_invoice.py:744 |
| 1493 | 1154 | ======= | ||
| 1494 | 1155 | #: code:addons/account/account.py:2346 | ||
| 1495 | 1156 | #: code:addons/account/account_bank_statement.py:424 | ||
| 1496 | 1157 | #: code:addons/account/account_invoice.py:77 | ||
| 1497 | 1158 | #: code:addons/account/account_invoice.py:775 | ||
| 1498 | 1159 | >>>>>>> MERGE-SOURCE | ||
| 1499 | 1105 | #: code:addons/account/account_move_line.py:195 | 1160 | #: code:addons/account/account_move_line.py:195 |
| 1500 | 1106 | #, python-format | 1161 | #, python-format |
| 1501 | 1107 | msgid "No Analytic Journal !" | 1162 | msgid "No Analytic Journal !" |
| 1502 | @@ -1533,8 +1588,10 @@ | |||
| 1503 | 1533 | msgstr "" | 1588 | msgstr "" |
| 1504 | 1534 | 1589 | ||
| 1505 | 1535 | #. module: account | 1590 | #. module: account |
| 1506 | 1591 | #: report:account.account.balance:0 | ||
| 1507 | 1536 | #: selection:account.balance.report,display_account:0 | 1592 | #: selection:account.balance.report,display_account:0 |
| 1508 | 1537 | #: selection:account.common.account.report,display_account:0 | 1593 | #: selection:account.common.account.report,display_account:0 |
| 1509 | 1594 | #: report:account.general.ledger_landscape:0 | ||
| 1510 | 1538 | #: selection:account.partner.balance,display_partner:0 | 1595 | #: selection:account.partner.balance,display_partner:0 |
| 1511 | 1539 | #: selection:account.report.general.ledger,display_account:0 | 1596 | #: selection:account.report.general.ledger,display_account:0 |
| 1512 | 1540 | msgid "With balance is not equal to 0" | 1597 | msgid "With balance is not equal to 0" |
| 1513 | @@ -1764,6 +1821,10 @@ | |||
| 1514 | 1764 | #: view:account.invoice:0 | 1821 | #: view:account.invoice:0 |
| 1515 | 1765 | #: view:account.invoice.report:0 | 1822 | #: view:account.invoice.report:0 |
| 1516 | 1766 | #: field:account.move.line,invoice:0 | 1823 | #: field:account.move.line,invoice:0 |
| 1517 | 1824 | <<<<<<< TREE | ||
| 1518 | 1825 | ======= | ||
| 1519 | 1826 | #: code:addons/account/account_invoice.py:1157 | ||
| 1520 | 1827 | >>>>>>> MERGE-SOURCE | ||
| 1521 | 1767 | #: model:ir.model,name:account.model_account_invoice | 1828 | #: model:ir.model,name:account.model_account_invoice |
| 1522 | 1768 | #: model:res.request.link,name:account.req_link_invoice | 1829 | #: model:res.request.link,name:account.req_link_invoice |
| 1523 | 1769 | msgid "Invoice" | 1830 | msgid "Invoice" |
| 1524 | @@ -2012,11 +2073,20 @@ | |||
| 1525 | 2012 | #: code:addons/account/account_bank_statement.py:418 | 2073 | #: code:addons/account/account_bank_statement.py:418 |
| 1526 | 2013 | #: code:addons/account/account_cash_statement.py:256 | 2074 | #: code:addons/account/account_cash_statement.py:256 |
| 1527 | 2014 | #: code:addons/account/account_cash_statement.py:300 | 2075 | #: code:addons/account/account_cash_statement.py:300 |
| 1528 | 2076 | <<<<<<< TREE | ||
| 1529 | 2015 | #: code:addons/account/account_invoice.py:867 | 2077 | #: code:addons/account/account_invoice.py:867 |
| 1530 | 2016 | #: code:addons/account/account_invoice.py:901 | 2078 | #: code:addons/account/account_invoice.py:901 |
| 1531 | 2017 | #: code:addons/account/account_invoice.py:1091 | 2079 | #: code:addons/account/account_invoice.py:1091 |
| 1532 | 2018 | #: code:addons/account/account_move_line.py:578 | 2080 | #: code:addons/account/account_move_line.py:578 |
| 1533 | 2019 | #: code:addons/account/account_move_line.py:831 | 2081 | #: code:addons/account/account_move_line.py:831 |
| 1534 | 2082 | ======= | ||
| 1535 | 2083 | #: code:addons/account/account_invoice.py:899 | ||
| 1536 | 2084 | #: code:addons/account/account_invoice.py:933 | ||
| 1537 | 2085 | #: code:addons/account/account_invoice.py:1124 | ||
| 1538 | 2086 | #: code:addons/account/account_move_line.py:579 | ||
| 1539 | 2087 | #: code:addons/account/account_move_line.py:828 | ||
| 1540 | 2088 | #: code:addons/account/account_move_line.py:851 | ||
| 1541 | 2089 | >>>>>>> MERGE-SOURCE | ||
| 1542 | 2020 | #: code:addons/account/account_move_line.py:854 | 2090 | #: code:addons/account/account_move_line.py:854 |
| 1543 | 2021 | #: code:addons/account/account_move_line.py:857 | 2091 | #: code:addons/account/account_move_line.py:857 |
| 1544 | 2022 | #: code:addons/account/account_move_line.py:1122 | 2092 | #: code:addons/account/account_move_line.py:1122 |
| 1545 | @@ -2250,7 +2320,9 @@ | |||
| 1546 | 2250 | #: selection:account.common.partner.report,result_selection:0 | 2320 | #: selection:account.common.partner.report,result_selection:0 |
| 1547 | 2251 | #: selection:account.partner.balance,result_selection:0 | 2321 | #: selection:account.partner.balance,result_selection:0 |
| 1548 | 2252 | #: selection:account.partner.ledger,result_selection:0 | 2322 | #: selection:account.partner.ledger,result_selection:0 |
| 1549 | 2323 | #: report:account.third_party_ledger:0 | ||
| 1550 | 2253 | #: code:addons/account/report/account_partner_balance.py:299 | 2324 | #: code:addons/account/report/account_partner_balance.py:299 |
| 1551 | 2325 | #: code:addons/account/report/account_partner_ledger.py:274 | ||
| 1552 | 2254 | #, python-format | 2326 | #, python-format |
| 1553 | 2255 | msgid "Payable Accounts" | 2327 | msgid "Payable Accounts" |
| 1554 | 2256 | msgstr "Разплащателни сметки" | 2328 | msgstr "Разплащателни сметки" |
| 1555 | @@ -2555,7 +2627,11 @@ | |||
| 1556 | 2555 | msgstr "Създаване на сметка според този шаблон" | 2627 | msgstr "Създаване на сметка според този шаблон" |
| 1557 | 2556 | 2628 | ||
| 1558 | 2557 | #. module: account | 2629 | #. module: account |
| 1559 | 2630 | <<<<<<< TREE | ||
| 1560 | 2558 | #: code:addons/account/account_invoice.py:901 | 2631 | #: code:addons/account/account_invoice.py:901 |
| 1561 | 2632 | ======= | ||
| 1562 | 2633 | #: code:addons/account/account_invoice.py:933 | ||
| 1563 | 2634 | >>>>>>> MERGE-SOURCE | ||
| 1564 | 2559 | #, python-format | 2635 | #, python-format |
| 1565 | 2560 | msgid "" | 2636 | msgid "" |
| 1566 | 2561 | "Cannot create the invoice.\n" | 2637 | "Cannot create the invoice.\n" |
| 1567 | @@ -2825,6 +2901,7 @@ | |||
| 1568 | 2825 | msgstr "Сметки" | 2901 | msgstr "Сметки" |
| 1569 | 2826 | 2902 | ||
| 1570 | 2827 | #. module: account | 2903 | #. module: account |
| 1571 | 2904 | <<<<<<< TREE | ||
| 1572 | 2828 | #: code:addons/account/account.py:3503 | 2905 | #: code:addons/account/account.py:3503 |
| 1573 | 2829 | #: code:addons/account/account_bank_statement.py:404 | 2906 | #: code:addons/account/account_bank_statement.py:404 |
| 1574 | 2830 | #: code:addons/account/account_invoice.py:378 | 2907 | #: code:addons/account/account_invoice.py:378 |
| 1575 | @@ -2834,6 +2911,16 @@ | |||
| 1576 | 2834 | #: code:addons/account/account_invoice.py:605 | 2911 | #: code:addons/account/account_invoice.py:605 |
| 1577 | 2835 | #: code:addons/account/account_invoice.py:627 | 2912 | #: code:addons/account/account_invoice.py:627 |
| 1578 | 2836 | #: code:addons/account/account_move_line.py:535 | 2913 | #: code:addons/account/account_move_line.py:535 |
| 1579 | 2914 | ======= | ||
| 1580 | 2915 | #: code:addons/account/account.py:3541 | ||
| 1581 | 2916 | #: code:addons/account/account_bank_statement.py:405 | ||
| 1582 | 2917 | #: code:addons/account/account_invoice.py:507 | ||
| 1583 | 2918 | #: code:addons/account/account_invoice.py:609 | ||
| 1584 | 2919 | #: code:addons/account/account_invoice.py:624 | ||
| 1585 | 2920 | #: code:addons/account/account_invoice.py:632 | ||
| 1586 | 2921 | #: code:addons/account/account_invoice.py:657 | ||
| 1587 | 2922 | #: code:addons/account/account_move_line.py:536 | ||
| 1588 | 2923 | >>>>>>> MERGE-SOURCE | ||
| 1589 | 2837 | #, python-format | 2924 | #, python-format |
| 1590 | 2838 | msgid "Configuration Error!" | 2925 | msgid "Configuration Error!" |
| 1591 | 2839 | msgstr "Грешка при настройване!" | 2926 | msgstr "Грешка при настройване!" |
| 1592 | @@ -3057,8 +3144,13 @@ | |||
| 1593 | 3057 | msgstr "" | 3144 | msgstr "" |
| 1594 | 3058 | 3145 | ||
| 1595 | 3059 | #. module: account | 3146 | #. module: account |
| 1596 | 3147 | <<<<<<< TREE | ||
| 1597 | 3060 | #: code:addons/account/account.py:2308 | 3148 | #: code:addons/account/account.py:2308 |
| 1598 | 3061 | #: code:addons/account/account_invoice.py:744 | 3149 | #: code:addons/account/account_invoice.py:744 |
| 1599 | 3150 | ======= | ||
| 1600 | 3151 | #: code:addons/account/account.py:2346 | ||
| 1601 | 3152 | #: code:addons/account/account_invoice.py:775 | ||
| 1602 | 3153 | >>>>>>> MERGE-SOURCE | ||
| 1603 | 3062 | #: code:addons/account/account_move_line.py:195 | 3154 | #: code:addons/account/account_move_line.py:195 |
| 1604 | 3063 | #, python-format | 3155 | #, python-format |
| 1605 | 3064 | msgid "You have to define an analytic journal on the '%s' journal!" | 3156 | msgid "You have to define an analytic journal on the '%s' journal!" |
| 1606 | @@ -3119,6 +3211,11 @@ | |||
| 1607 | 3119 | msgstr "" | 3211 | msgstr "" |
| 1608 | 3120 | 3212 | ||
| 1609 | 3121 | #. module: account | 3213 | #. module: account |
| 1610 | 3214 | #: report:account.journal.period.print:0 | ||
| 1611 | 3215 | msgid "Reference Number" | ||
| 1612 | 3216 | msgstr "Референтен номер" | ||
| 1613 | 3217 | |||
| 1614 | 3218 | #. module: account | ||
| 1615 | 3122 | #: selection:account.entries.report,month:0 | 3219 | #: selection:account.entries.report,month:0 |
| 1616 | 3123 | #: selection:account.invoice.report,month:0 | 3220 | #: selection:account.invoice.report,month:0 |
| 1617 | 3124 | #: selection:analytic.entries.report,month:0 | 3221 | #: selection:analytic.entries.report,month:0 |
| 1618 | @@ -3220,7 +3317,11 @@ | |||
| 1619 | 3220 | msgstr "Фискална позиция" | 3317 | msgstr "Фискална позиция" |
| 1620 | 3221 | 3318 | ||
| 1621 | 3222 | #. module: account | 3319 | #. module: account |
| 1622 | 3320 | <<<<<<< TREE | ||
| 1623 | 3223 | #: code:addons/account/account_invoice.py:791 | 3321 | #: code:addons/account/account_invoice.py:791 |
| 1624 | 3322 | ======= | ||
| 1625 | 3323 | #: code:addons/account/account_invoice.py:823 | ||
| 1626 | 3324 | >>>>>>> MERGE-SOURCE | ||
| 1627 | 3224 | #, python-format | 3325 | #, python-format |
| 1628 | 3225 | msgid "" | 3326 | msgid "" |
| 1629 | 3226 | "Tax base different!\n" | 3327 | "Tax base different!\n" |
| 1630 | @@ -3381,8 +3482,13 @@ | |||
| 1631 | 3381 | msgstr "Изглед" | 3482 | msgstr "Изглед" |
| 1632 | 3382 | 3483 | ||
| 1633 | 3383 | #. module: account | 3484 | #. module: account |
| 1634 | 3485 | <<<<<<< TREE | ||
| 1635 | 3384 | #: code:addons/account/account.py:3422 | 3486 | #: code:addons/account/account.py:3422 |
| 1636 | 3385 | #: code:addons/account/account_bank.py:95 | 3487 | #: code:addons/account/account_bank.py:95 |
| 1637 | 3488 | ======= | ||
| 1638 | 3489 | #: code:addons/account/account.py:3460 | ||
| 1639 | 3490 | #: code:addons/account/account_bank.py:94 | ||
| 1640 | 3491 | >>>>>>> MERGE-SOURCE | ||
| 1641 | 3386 | #, python-format | 3492 | #, python-format |
| 1642 | 3387 | msgid "BNK" | 3493 | msgid "BNK" |
| 1643 | 3388 | msgstr "" | 3494 | msgstr "" |
| 1644 | @@ -3638,7 +3744,11 @@ | |||
| 1645 | 3638 | msgstr "" | 3744 | msgstr "" |
| 1646 | 3639 | 3745 | ||
| 1647 | 3640 | #. module: account | 3746 | #. module: account |
| 1648 | 3747 | <<<<<<< TREE | ||
| 1649 | 3641 | #: code:addons/account/account_invoice.py:984 | 3748 | #: code:addons/account/account_invoice.py:984 |
| 1650 | 3749 | ======= | ||
| 1651 | 3750 | #: code:addons/account/account_invoice.py:1016 | ||
| 1652 | 3751 | >>>>>>> MERGE-SOURCE | ||
| 1653 | 3642 | #, python-format | 3752 | #, python-format |
| 1654 | 3643 | msgid "" | 3753 | msgid "" |
| 1655 | 3644 | "You cannot create an invoice on a centralized journal. Uncheck the " | 3754 | "You cannot create an invoice on a centralized journal. Uncheck the " |
| 1656 | @@ -3653,7 +3763,11 @@ | |||
| 1657 | 3653 | msgstr "Начален баланс" | 3763 | msgstr "Начален баланс" |
| 1658 | 3654 | 3764 | ||
| 1659 | 3655 | #. module: account | 3765 | #. module: account |
| 1660 | 3766 | <<<<<<< TREE | ||
| 1661 | 3656 | #: code:addons/account/account_invoice.py:1434 | 3767 | #: code:addons/account/account_invoice.py:1434 |
| 1662 | 3768 | ======= | ||
| 1663 | 3769 | #: code:addons/account/account_invoice.py:1465 | ||
| 1664 | 3770 | >>>>>>> MERGE-SOURCE | ||
| 1665 | 3657 | #, python-format | 3771 | #, python-format |
| 1666 | 3658 | msgid "No Partner Defined !" | 3772 | msgid "No Partner Defined !" |
| 1667 | 3659 | msgstr "Не е зададен партньор !" | 3773 | msgstr "Не е зададен партньор !" |
| 1668 | @@ -3917,14 +4031,21 @@ | |||
| 1669 | 3917 | msgstr "" | 4031 | msgstr "" |
| 1670 | 3918 | 4032 | ||
| 1671 | 3919 | #. module: account | 4033 | #. module: account |
| 1672 | 4034 | <<<<<<< TREE | ||
| 1673 | 3920 | #: report:account.invoice:0 | 4035 | #: report:account.invoice:0 |
| 1674 | 3921 | msgid "VAT :" | 4036 | msgid "VAT :" |
| 1675 | 3922 | msgstr "ДДС :" | 4037 | msgstr "ДДС :" |
| 1676 | 3923 | 4038 | ||
| 1677 | 3924 | #. module: account | 4039 | #. module: account |
| 1678 | 4040 | ======= | ||
| 1679 | 4041 | #: report:account.account.balance:0 | ||
| 1680 | 4042 | >>>>>>> MERGE-SOURCE | ||
| 1681 | 3925 | #: report:account.central.journal:0 | 4043 | #: report:account.central.journal:0 |
| 1682 | 3926 | #: view:account.config.settings:0 | 4044 | #: view:account.config.settings:0 |
| 1683 | 4045 | #: report:account.general.journal:0 | ||
| 1684 | 3927 | #: report:account.general.ledger:0 | 4046 | #: report:account.general.ledger:0 |
| 1685 | 4047 | #: report:account.general.ledger_landscape:0 | ||
| 1686 | 4048 | #: report:account.journal.period.print:0 | ||
| 1687 | 3928 | #: report:account.partner.balance:0 | 4049 | #: report:account.partner.balance:0 |
| 1688 | 3929 | #: report:account.third_party_ledger:0 | 4050 | #: report:account.third_party_ledger:0 |
| 1689 | 3930 | #: report:account.third_party_ledger_other:0 | 4051 | #: report:account.third_party_ledger_other:0 |
| 1690 | @@ -4283,7 +4404,11 @@ | |||
| 1691 | 4283 | msgstr "Косолидирани подчинени сметки" | 4404 | msgstr "Косолидирани подчинени сметки" |
| 1692 | 4284 | 4405 | ||
| 1693 | 4285 | #. module: account | 4406 | #. module: account |
| 1694 | 4407 | <<<<<<< TREE | ||
| 1695 | 4286 | #: code:addons/account/account_invoice.py:550 | 4408 | #: code:addons/account/account_invoice.py:550 |
| 1696 | 4409 | ======= | ||
| 1697 | 4410 | #: code:addons/account/account_invoice.py:573 | ||
| 1698 | 4411 | >>>>>>> MERGE-SOURCE | ||
| 1699 | 4287 | #: code:addons/account/wizard/account_invoice_refund.py:146 | 4412 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
| 1700 | 4288 | #, python-format | 4413 | #, python-format |
| 1701 | 4289 | msgid "Insufficient Data!" | 4414 | msgid "Insufficient Data!" |
| 1702 | @@ -4550,8 +4675,13 @@ | |||
| 1703 | 4550 | msgstr "" | 4675 | msgstr "" |
| 1704 | 4551 | 4676 | ||
| 1705 | 4552 | #. module: account | 4677 | #. module: account |
| 1706 | 4678 | <<<<<<< TREE | ||
| 1707 | 4553 | #: code:addons/account/account_invoice.py:583 | 4679 | #: code:addons/account/account_invoice.py:583 |
| 1708 | 4554 | #: code:addons/account/account_invoice.py:598 | 4680 | #: code:addons/account/account_invoice.py:598 |
| 1709 | 4681 | ======= | ||
| 1710 | 4682 | #: code:addons/account/account_invoice.py:610 | ||
| 1711 | 4683 | #: code:addons/account/account_invoice.py:625 | ||
| 1712 | 4684 | >>>>>>> MERGE-SOURCE | ||
| 1713 | 4555 | #, python-format | 4685 | #, python-format |
| 1714 | 4556 | msgid "" | 4686 | msgid "" |
| 1715 | 4557 | "Cannot find a chart of account, you should create one from Settings\\" | 4687 | "Cannot find a chart of account, you should create one from Settings\\" |
| 1716 | @@ -4824,7 +4954,11 @@ | |||
| 1717 | 4824 | msgstr "" | 4954 | msgstr "" |
| 1718 | 4825 | 4955 | ||
| 1719 | 4826 | #. module: account | 4956 | #. module: account |
| 1720 | 4957 | <<<<<<< TREE | ||
| 1721 | 4827 | #: code:addons/account/account_invoice.py:627 | 4958 | #: code:addons/account/account_invoice.py:627 |
| 1722 | 4959 | ======= | ||
| 1723 | 4960 | #: code:addons/account/account_invoice.py:658 | ||
| 1724 | 4961 | >>>>>>> MERGE-SOURCE | ||
| 1725 | 4828 | #, python-format | 4962 | #, python-format |
| 1726 | 4829 | msgid "" | 4963 | msgid "" |
| 1727 | 4830 | "Cannot find any account journal of %s type for this company.\n" | 4964 | "Cannot find any account journal of %s type for this company.\n" |
| 1728 | @@ -5148,7 +5282,11 @@ | |||
| 1729 | 5148 | msgstr "Бланка за данък" | 5282 | msgstr "Бланка за данък" |
| 1730 | 5149 | 5283 | ||
| 1731 | 5150 | #. module: account | 5284 | #. module: account |
| 1732 | 5285 | <<<<<<< TREE | ||
| 1733 | 5151 | #: code:addons/account/account_invoice.py:890 | 5286 | #: code:addons/account/account_invoice.py:890 |
| 1734 | 5287 | ======= | ||
| 1735 | 5288 | #: code:addons/account/account_invoice.py:922 | ||
| 1736 | 5289 | >>>>>>> MERGE-SOURCE | ||
| 1737 | 5152 | #, python-format | 5290 | #, python-format |
| 1738 | 5153 | msgid "" | 5291 | msgid "" |
| 1739 | 5154 | "Please verify the price of the invoice !\n" | 5292 | "Please verify the price of the invoice !\n" |
| 1740 | @@ -5475,7 +5613,11 @@ | |||
| 1741 | 5475 | msgstr "Изчисли кода (if type=code)" | 5613 | msgstr "Изчисли кода (if type=code)" |
| 1742 | 5476 | 5614 | ||
| 1743 | 5477 | #. module: account | 5615 | #. module: account |
| 1744 | 5616 | <<<<<<< TREE | ||
| 1745 | 5478 | #: code:addons/account/account_invoice.py:485 | 5617 | #: code:addons/account/account_invoice.py:485 |
| 1746 | 5618 | ======= | ||
| 1747 | 5619 | #: code:addons/account/account_invoice.py:508 | ||
| 1748 | 5620 | >>>>>>> MERGE-SOURCE | ||
| 1749 | 5479 | #, python-format | 5621 | #, python-format |
| 1750 | 5480 | msgid "" | 5622 | msgid "" |
| 1751 | 5481 | "Cannot find a chart of accounts for this company, you should create one." | 5623 | "Cannot find a chart of accounts for this company, you should create one." |
| 1752 | @@ -5861,6 +6003,18 @@ | |||
| 1753 | 5861 | msgstr "" | 6003 | msgstr "" |
| 1754 | 5862 | 6004 | ||
| 1755 | 5863 | #. module: account | 6005 | #. module: account |
| 1756 | 6006 | <<<<<<< TREE | ||
| 1757 | 6007 | ======= | ||
| 1758 | 6008 | #: code:addons/account/account_invoice.py:474 | ||
| 1759 | 6009 | #, python-format | ||
| 1760 | 6010 | msgid "" | ||
| 1761 | 6011 | "You cannot delete an invoice after it has been validated (and received a " | ||
| 1762 | 6012 | "number). You can set it back to \"Draft\" state and modify its content, " | ||
| 1763 | 6013 | "then re-confirm it." | ||
| 1764 | 6014 | msgstr "" | ||
| 1765 | 6015 | |||
| 1766 | 6016 | #. module: account | ||
| 1767 | 6017 | >>>>>>> MERGE-SOURCE | ||
| 1768 | 5864 | #: help:account.automatic.reconcile,power:0 | 6018 | #: help:account.automatic.reconcile,power:0 |
| 1769 | 5865 | msgid "" | 6019 | msgid "" |
| 1770 | 5866 | "Number of partial amounts that can be combined to find a balance point can " | 6020 | "Number of partial amounts that can be combined to find a balance point can " |
| 1771 | @@ -6012,7 +6166,11 @@ | |||
| 1772 | 6012 | #: view:account.config.settings:0 | 6166 | #: view:account.config.settings:0 |
| 1773 | 6013 | #: view:account.invoice:0 | 6167 | #: view:account.invoice:0 |
| 1774 | 6014 | #: view:account.invoice.report:0 | 6168 | #: view:account.invoice.report:0 |
| 1775 | 6169 | <<<<<<< TREE | ||
| 1776 | 6015 | #: code:addons/account/account_invoice.py:355 | 6170 | #: code:addons/account/account_invoice.py:355 |
| 1777 | 6171 | ======= | ||
| 1778 | 6172 | #: code:addons/account/account_invoice.py:390 | ||
| 1779 | 6173 | >>>>>>> MERGE-SOURCE | ||
| 1780 | 6016 | #, python-format | 6174 | #, python-format |
| 1781 | 6017 | msgid "Supplier" | 6175 | msgid "Supplier" |
| 1782 | 6018 | msgstr "Доставчик" | 6176 | msgstr "Доставчик" |
| 1783 | @@ -6032,7 +6190,7 @@ | |||
| 1784 | 6032 | msgstr "Сметка n°" | 6190 | msgstr "Сметка n°" |
| 1785 | 6033 | 6191 | ||
| 1786 | 6034 | #. module: account | 6192 | #. module: account |
| 1788 | 6035 | #: code:addons/account/account_invoice.py:92 | 6193 | #: code:addons/account/account_invoice.py:95 |
| 1789 | 6036 | #, python-format | 6194 | #, python-format |
| 1790 | 6037 | msgid "Free Reference" | 6195 | msgid "Free Reference" |
| 1791 | 6038 | msgstr "Свободна отпратка" | 6196 | msgstr "Свободна отпратка" |
| 1792 | @@ -6042,7 +6200,9 @@ | |||
| 1793 | 6042 | #: selection:account.common.partner.report,result_selection:0 | 6200 | #: selection:account.common.partner.report,result_selection:0 |
| 1794 | 6043 | #: selection:account.partner.balance,result_selection:0 | 6201 | #: selection:account.partner.balance,result_selection:0 |
| 1795 | 6044 | #: selection:account.partner.ledger,result_selection:0 | 6202 | #: selection:account.partner.ledger,result_selection:0 |
| 1796 | 6203 | #: report:account.third_party_ledger:0 | ||
| 1797 | 6045 | #: code:addons/account/report/account_partner_balance.py:301 | 6204 | #: code:addons/account/report/account_partner_balance.py:301 |
| 1798 | 6205 | #: code:addons/account/report/account_partner_ledger.py:276 | ||
| 1799 | 6046 | #, python-format | 6206 | #, python-format |
| 1800 | 6047 | msgid "Receivable and Payable Accounts" | 6207 | msgid "Receivable and Payable Accounts" |
| 1801 | 6048 | msgstr "Сметки за получаване и плащане" | 6208 | msgstr "Сметки за получаване и плащане" |
| 1802 | @@ -6340,7 +6500,11 @@ | |||
| 1803 | 6340 | msgstr "" | 6500 | msgstr "" |
| 1804 | 6341 | 6501 | ||
| 1805 | 6342 | #. module: account | 6502 | #. module: account |
| 1806 | 6503 | <<<<<<< TREE | ||
| 1807 | 6343 | #: code:addons/account/account_invoice.py:1091 | 6504 | #: code:addons/account/account_invoice.py:1091 |
| 1808 | 6505 | ======= | ||
| 1809 | 6506 | #: code:addons/account/account_invoice.py:1124 | ||
| 1810 | 6507 | >>>>>>> MERGE-SOURCE | ||
| 1811 | 6344 | #, python-format | 6508 | #, python-format |
| 1812 | 6345 | msgid "" | 6509 | msgid "" |
| 1813 | 6346 | "You cannot cancel an invoice which is partially paid. You need to " | 6510 | "You cannot cancel an invoice which is partially paid. You need to " |
| 1814 | @@ -6513,7 +6677,11 @@ | |||
| 1815 | 6513 | msgstr "" | 6677 | msgstr "" |
| 1816 | 6514 | 6678 | ||
| 1817 | 6515 | #. module: account | 6679 | #. module: account |
| 1818 | 6680 | <<<<<<< TREE | ||
| 1819 | 6516 | #: code:addons/account/account_invoice.py:606 | 6681 | #: code:addons/account/account_invoice.py:606 |
| 1820 | 6682 | ======= | ||
| 1821 | 6683 | #: code:addons/account/account_invoice.py:633 | ||
| 1822 | 6684 | >>>>>>> MERGE-SOURCE | ||
| 1823 | 6517 | #, python-format | 6685 | #, python-format |
| 1824 | 6518 | msgid "Invoice line account's company and invoice's compnay does not match." | 6686 | msgid "Invoice line account's company and invoice's compnay does not match." |
| 1825 | 6519 | msgstr "" | 6687 | msgstr "" |
| 1826 | @@ -6663,12 +6831,21 @@ | |||
| 1827 | 6663 | "В този случай реда на изчисление е важен." | 6831 | "В този случай реда на изчисление е важен." |
| 1828 | 6664 | 6832 | ||
| 1829 | 6665 | #. module: account | 6833 | #. module: account |
| 1830 | 6834 | <<<<<<< TREE | ||
| 1831 | 6666 | #: code:addons/account/account.py:1410 | 6835 | #: code:addons/account/account.py:1410 |
| 1832 | 6667 | #: code:addons/account/account.py:1415 | 6836 | #: code:addons/account/account.py:1415 |
| 1833 | 6668 | #: code:addons/account/account.py:1444 | 6837 | #: code:addons/account/account.py:1444 |
| 1834 | 6669 | #: code:addons/account/account.py:1451 | 6838 | #: code:addons/account/account.py:1451 |
| 1835 | 6670 | #: code:addons/account/account_invoice.py:983 | 6839 | #: code:addons/account/account_invoice.py:983 |
| 1836 | 6671 | #: code:addons/account/account_move_line.py:1008 | 6840 | #: code:addons/account/account_move_line.py:1008 |
| 1837 | 6841 | ======= | ||
| 1838 | 6842 | #: code:addons/account/account.py:1448 | ||
| 1839 | 6843 | #: code:addons/account/account.py:1453 | ||
| 1840 | 6844 | #: code:addons/account/account.py:1482 | ||
| 1841 | 6845 | #: code:addons/account/account.py:1489 | ||
| 1842 | 6846 | #: code:addons/account/account_invoice.py:1015 | ||
| 1843 | 6847 | #: code:addons/account/account_move_line.py:1005 | ||
| 1844 | 6848 | >>>>>>> MERGE-SOURCE | ||
| 1845 | 6672 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 | 6849 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
| 1846 | 6673 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 | 6850 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
| 1847 | 6674 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 | 6851 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
| 1848 | @@ -6746,6 +6923,10 @@ | |||
| 1849 | 6746 | #: report:account.invoice:0 | 6923 | #: report:account.invoice:0 |
| 1850 | 6747 | #: selection:account.invoice,type:0 | 6924 | #: selection:account.invoice,type:0 |
| 1851 | 6748 | #: selection:account.invoice.report,type:0 | 6925 | #: selection:account.invoice.report,type:0 |
| 1852 | 6926 | <<<<<<< TREE | ||
| 1853 | 6927 | ======= | ||
| 1854 | 6928 | #: code:addons/account/account_invoice.py:1160 | ||
| 1855 | 6929 | >>>>>>> MERGE-SOURCE | ||
| 1856 | 6749 | #: selection:report.invoice.created,type:0 | 6930 | #: selection:report.invoice.created,type:0 |
| 1857 | 6750 | msgid "Supplier Refund" | 6931 | msgid "Supplier Refund" |
| 1858 | 6751 | msgstr "Обезщетение на доставчик" | 6932 | msgstr "Обезщетение на доставчик" |
| 1859 | @@ -7882,7 +8063,11 @@ | |||
| 1860 | 7882 | msgstr "Май" | 8063 | msgstr "Май" |
| 1861 | 7883 | 8064 | ||
| 1862 | 7884 | #. module: account | 8065 | #. module: account |
| 1863 | 8066 | <<<<<<< TREE | ||
| 1864 | 7885 | #: code:addons/account/account_invoice.py:788 | 8067 | #: code:addons/account/account_invoice.py:788 |
| 1865 | 8068 | ======= | ||
| 1866 | 8069 | #: code:addons/account/account_invoice.py:820 | ||
| 1867 | 8070 | >>>>>>> MERGE-SOURCE | ||
| 1868 | 7886 | #, python-format | 8071 | #, python-format |
| 1869 | 7887 | msgid "Global taxes defined, but they are not in invoice lines !" | 8072 | msgid "Global taxes defined, but they are not in invoice lines !" |
| 1870 | 7888 | msgstr "" | 8073 | msgstr "" |
| 1871 | @@ -7923,7 +8108,11 @@ | |||
| 1872 | 7923 | #: view:account.config.settings:0 | 8108 | #: view:account.config.settings:0 |
| 1873 | 7924 | #: view:account.invoice:0 | 8109 | #: view:account.invoice:0 |
| 1874 | 7925 | #: view:account.invoice.report:0 | 8110 | #: view:account.invoice.report:0 |
| 1875 | 8111 | <<<<<<< TREE | ||
| 1876 | 7926 | #: code:addons/account/account_invoice.py:353 | 8112 | #: code:addons/account/account_invoice.py:353 |
| 1877 | 8113 | ======= | ||
| 1878 | 8114 | #: code:addons/account/account_invoice.py:388 | ||
| 1879 | 8115 | >>>>>>> MERGE-SOURCE | ||
| 1880 | 7927 | #, python-format | 8116 | #, python-format |
| 1881 | 7928 | msgid "Customer" | 8117 | msgid "Customer" |
| 1882 | 7929 | msgstr "Клиент" | 8118 | msgstr "Клиент" |
| 1883 | @@ -8060,6 +8249,17 @@ | |||
| 1884 | 8060 | msgstr "Приравняване на транзакции" | 8249 | msgstr "Приравняване на транзакции" |
| 1885 | 8061 | 8250 | ||
| 1886 | 8062 | #. module: account | 8251 | #. module: account |
| 1887 | 8252 | <<<<<<< TREE | ||
| 1888 | 8253 | ======= | ||
| 1889 | 8254 | #: code:addons/account/account_invoice.py:472 | ||
| 1890 | 8255 | #, python-format | ||
| 1891 | 8256 | msgid "" | ||
| 1892 | 8257 | "You cannot delete an invoice which is not draft or cancelled. You should " | ||
| 1893 | 8258 | "refund it instead." | ||
| 1894 | 8259 | msgstr "" | ||
| 1895 | 8260 | |||
| 1896 | 8261 | #. module: account | ||
| 1897 | 8262 | >>>>>>> MERGE-SOURCE | ||
| 1898 | 8063 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement | 8263 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
| 1899 | 8064 | msgid "Legal Reports" | 8264 | msgid "Legal Reports" |
| 1900 | 8065 | msgstr "" | 8265 | msgstr "" |
| 1901 | @@ -8176,7 +8376,11 @@ | |||
| 1902 | 8176 | msgstr "Изберете валута за фактурата" | 8376 | msgstr "Изберете валута за фактурата" |
| 1903 | 8177 | 8377 | ||
| 1904 | 8178 | #. module: account | 8378 | #. module: account |
| 1905 | 8379 | <<<<<<< TREE | ||
| 1906 | 8179 | #: code:addons/account/account_invoice.py:869 | 8380 | #: code:addons/account/account_invoice.py:869 |
| 1907 | 8381 | ======= | ||
| 1908 | 8382 | #: code:addons/account/account_invoice.py:901 | ||
| 1909 | 8383 | >>>>>>> MERGE-SOURCE | ||
| 1910 | 8180 | #, python-format | 8384 | #, python-format |
| 1911 | 8181 | msgid "No Invoice Lines !" | 8385 | msgid "No Invoice Lines !" |
| 1912 | 8182 | msgstr "Няма фактурни редове!" | 8386 | msgstr "Няма фактурни редове!" |
| 1913 | @@ -8251,7 +8455,11 @@ | |||
| 1914 | 8251 | msgstr "Асоцииран партньор" | 8455 | msgstr "Асоцииран партньор" |
| 1915 | 8252 | 8456 | ||
| 1916 | 8253 | #. module: account | 8457 | #. module: account |
| 1917 | 8458 | <<<<<<< TREE | ||
| 1918 | 8254 | #: code:addons/account/account_invoice.py:1434 | 8459 | #: code:addons/account/account_invoice.py:1434 |
| 1919 | 8460 | ======= | ||
| 1920 | 8461 | #: code:addons/account/account_invoice.py:1465 | ||
| 1921 | 8462 | >>>>>>> MERGE-SOURCE | ||
| 1922 | 8255 | #, python-format | 8463 | #, python-format |
| 1923 | 8256 | msgid "You must first select a partner !" | 8464 | msgid "You must first select a partner !" |
| 1924 | 8257 | msgstr "Първо трябва да изберете партньор !" | 8465 | msgstr "Първо трябва да изберете партньор !" |
| 1925 | @@ -9201,7 +9409,11 @@ | |||
| 1926 | 9201 | msgstr "Данък покупка (%)" | 9409 | msgstr "Данък покупка (%)" |
| 1927 | 9202 | 9410 | ||
| 1928 | 9203 | #. module: account | 9411 | #. module: account |
| 1929 | 9412 | <<<<<<< TREE | ||
| 1930 | 9204 | #: code:addons/account/account_invoice.py:869 | 9413 | #: code:addons/account/account_invoice.py:869 |
| 1931 | 9414 | ======= | ||
| 1932 | 9415 | #: code:addons/account/account_invoice.py:901 | ||
| 1933 | 9416 | >>>>>>> MERGE-SOURCE | ||
| 1934 | 9205 | #, python-format | 9417 | #, python-format |
| 1935 | 9206 | msgid "Please create some invoice lines." | 9418 | msgid "Please create some invoice lines." |
| 1936 | 9207 | msgstr "" | 9419 | msgstr "" |
| 1937 | @@ -9757,7 +9969,11 @@ | |||
| 1938 | 9757 | msgstr "Неприравнен" | 9969 | msgstr "Неприравнен" |
| 1939 | 9758 | 9970 | ||
| 1940 | 9759 | #. module: account | 9971 | #. module: account |
| 1941 | 9972 | <<<<<<< TREE | ||
| 1942 | 9760 | #: code:addons/account/account_invoice.py:890 | 9973 | #: code:addons/account/account_invoice.py:890 |
| 1943 | 9974 | ======= | ||
| 1944 | 9975 | #: code:addons/account/account_invoice.py:922 | ||
| 1945 | 9976 | >>>>>>> MERGE-SOURCE | ||
| 1946 | 9761 | #, python-format | 9977 | #, python-format |
| 1947 | 9762 | msgid "Bad total !" | 9978 | msgid "Bad total !" |
| 1948 | 9763 | msgstr "Грешна обща сума !" | 9979 | msgstr "Грешна обща сума !" |
| 1949 | @@ -10230,6 +10446,7 @@ | |||
| 1950 | 10230 | 10446 | ||
| 1951 | 10231 | #. module: account | 10447 | #. module: account |
| 1952 | 10232 | #: field:account.account,company_id:0 | 10448 | #: field:account.account,company_id:0 |
| 1953 | 10449 | #: report:account.account.balance:0 | ||
| 1954 | 10233 | #: field:account.aged.trial.balance,company_id:0 | 10450 | #: field:account.aged.trial.balance,company_id:0 |
| 1955 | 10234 | #: field:account.analytic.journal,company_id:0 | 10451 | #: field:account.analytic.journal,company_id:0 |
| 1956 | 10235 | #: field:account.balance.report,company_id:0 | 10452 | #: field:account.balance.report,company_id:0 |
| 1957 | @@ -10245,7 +10462,9 @@ | |||
| 1958 | 10245 | #: field:account.entries.report,company_id:0 | 10462 | #: field:account.entries.report,company_id:0 |
| 1959 | 10246 | #: field:account.fiscal.position,company_id:0 | 10463 | #: field:account.fiscal.position,company_id:0 |
| 1960 | 10247 | #: field:account.fiscalyear,company_id:0 | 10464 | #: field:account.fiscalyear,company_id:0 |
| 1961 | 10465 | #: report:account.general.journal:0 | ||
| 1962 | 10248 | #: field:account.general.journal,company_id:0 | 10466 | #: field:account.general.journal,company_id:0 |
| 1963 | 10467 | #: report:account.general.ledger_landscape:0 | ||
| 1964 | 10249 | #: field:account.installer,company_id:0 | 10468 | #: field:account.installer,company_id:0 |
| 1965 | 10250 | #: field:account.invoice,company_id:0 | 10469 | #: field:account.invoice,company_id:0 |
| 1966 | 10251 | #: field:account.invoice.line,company_id:0 | 10470 | #: field:account.invoice.line,company_id:0 |
| 1967 | @@ -10254,6 +10473,7 @@ | |||
| 1968 | 10254 | #: field:account.invoice.tax,company_id:0 | 10473 | #: field:account.invoice.tax,company_id:0 |
| 1969 | 10255 | #: field:account.journal,company_id:0 | 10474 | #: field:account.journal,company_id:0 |
| 1970 | 10256 | #: field:account.journal.period,company_id:0 | 10475 | #: field:account.journal.period,company_id:0 |
| 1971 | 10476 | #: report:account.journal.period.print:0 | ||
| 1972 | 10257 | #: field:account.model,company_id:0 | 10477 | #: field:account.model,company_id:0 |
| 1973 | 10258 | #: field:account.move,company_id:0 | 10478 | #: field:account.move,company_id:0 |
| 1974 | 10259 | #: field:account.move.line,company_id:0 | 10479 | #: field:account.move.line,company_id:0 |
| 1975 | @@ -10414,6 +10634,10 @@ | |||
| 1976 | 10414 | #: view:account.invoice:0 | 10634 | #: view:account.invoice:0 |
| 1977 | 10415 | #: selection:account.invoice,type:0 | 10635 | #: selection:account.invoice,type:0 |
| 1978 | 10416 | #: selection:account.invoice.report,type:0 | 10636 | #: selection:account.invoice.report,type:0 |
| 1979 | 10637 | <<<<<<< TREE | ||
| 1980 | 10638 | ======= | ||
| 1981 | 10639 | #: code:addons/account/account_invoice.py:1158 | ||
| 1982 | 10640 | >>>>>>> MERGE-SOURCE | ||
| 1983 | 10417 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 | 10641 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
| 1984 | 10418 | #: selection:report.invoice.created,type:0 | 10642 | #: selection:report.invoice.created,type:0 |
| 1985 | 10419 | msgid "Supplier Invoice" | 10643 | msgid "Supplier Invoice" |
| 1986 | @@ -10501,8 +10725,10 @@ | |||
| 1987 | 10501 | msgstr "" | 10725 | msgstr "" |
| 1988 | 10502 | 10726 | ||
| 1989 | 10503 | #. module: account | 10727 | #. module: account |
| 1990 | 10728 | #: report:account.account.balance:0 | ||
| 1991 | 10504 | #: selection:account.balance.report,display_account:0 | 10729 | #: selection:account.balance.report,display_account:0 |
| 1992 | 10505 | #: selection:account.common.account.report,display_account:0 | 10730 | #: selection:account.common.account.report,display_account:0 |
| 1993 | 10731 | #: report:account.general.ledger_landscape:0 | ||
| 1994 | 10506 | #: selection:account.report.general.ledger,display_account:0 | 10732 | #: selection:account.report.general.ledger,display_account:0 |
| 1995 | 10507 | msgid "With movements" | 10733 | msgid "With movements" |
| 1996 | 10508 | msgstr "С движения" | 10734 | msgstr "С движения" |
| 1997 | @@ -10597,7 +10823,11 @@ | |||
| 1998 | 10597 | msgstr "" | 10823 | msgstr "" |
| 1999 | 10598 | 10824 | ||
| 2000 | 10599 | #. module: account | 10825 | #. module: account |
| 2001 | 10826 | <<<<<<< TREE | ||
| 2002 | 10600 | #: code:addons/account/account_invoice.py:1515 | 10827 | #: code:addons/account/account_invoice.py:1515 |
| 2003 | 10828 | ======= | ||
| 2004 | 10829 | #: code:addons/account/account_invoice.py:1546 | ||
| 2005 | 10830 | >>>>>>> MERGE-SOURCE | ||
| 2006 | 10601 | #, python-format | 10831 | #, python-format |
| 2007 | 10602 | msgid "" | 10832 | msgid "" |
| 2008 | 10603 | "The selected unit of measure is not compatible with the unit of measure of " | 10833 | "The selected unit of measure is not compatible with the unit of measure of " |
| 2009 | @@ -10678,6 +10908,11 @@ | |||
| 2010 | 10678 | #: report:account.invoice:0 | 10908 | #: report:account.invoice:0 |
| 2011 | 10679 | #: view:account.invoice:0 | 10909 | #: view:account.invoice:0 |
| 2012 | 10680 | #: view:account.invoice.report:0 | 10910 | #: view:account.invoice.report:0 |
| 2013 | 10911 | <<<<<<< TREE | ||
| 2014 | 10912 | ======= | ||
| 2015 | 10913 | #: code:addons/account/account_invoice.py:1159 | ||
| 2016 | 10914 | #, python-format | ||
| 2017 | 10915 | >>>>>>> MERGE-SOURCE | ||
| 2018 | 10681 | msgid "Refund" | 10916 | msgid "Refund" |
| 2019 | 10682 | msgstr "Обезщетение" | 10917 | msgstr "Обезщетение" |
| 2020 | 10683 | 10918 | ||
| 2021 | @@ -10748,7 +10983,11 @@ | |||
| 2022 | 10748 | msgstr "Ръчно фактуриране на данъци" | 10983 | msgstr "Ръчно фактуриране на данъци" |
| 2023 | 10749 | 10984 | ||
| 2024 | 10750 | #. module: account | 10985 | #. module: account |
| 2025 | 10986 | <<<<<<< TREE | ||
| 2026 | 10751 | #: code:addons/account/account_invoice.py:550 | 10987 | #: code:addons/account/account_invoice.py:550 |
| 2027 | 10988 | ======= | ||
| 2028 | 10989 | #: code:addons/account/account_invoice.py:573 | ||
| 2029 | 10990 | >>>>>>> MERGE-SOURCE | ||
| 2030 | 10752 | #, python-format | 10991 | #, python-format |
| 2031 | 10753 | msgid "The payment term of supplier does not have a payment term line." | 10992 | msgid "The payment term of supplier does not have a payment term line." |
| 2032 | 10754 | msgstr "" | 10993 | msgstr "" |
| 2033 | 10755 | 10994 | ||
| 2034 | === modified file 'account/i18n/br.po' | |||
| 2035 | --- account/i18n/br.po 2013-06-13 18:15:03 +0000 | |||
| 2036 | +++ account/i18n/br.po 2013-06-19 09:20:00 +0000 | |||
| 2037 | @@ -7,15 +7,26 @@ | |||
| 2038 | 7 | msgstr "" | 7 | msgstr "" |
| 2039 | 8 | "Project-Id-Version: openobject-addons\n" | 8 | "Project-Id-Version: openobject-addons\n" |
| 2040 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
| 2041 | 10 | <<<<<<< TREE | ||
| 2042 | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 11 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
| 2043 | 11 | "PO-Revision-Date: 2010-12-12 09:25+0000\n" | 12 | "PO-Revision-Date: 2010-12-12 09:25+0000\n" |
| 2044 | 12 | "Last-Translator: OpenERP Administrators <Unknown>\n" | 13 | "Last-Translator: OpenERP Administrators <Unknown>\n" |
| 2045 | 14 | ======= | ||
| 2046 | 15 | "POT-Creation-Date: 2013-06-14 22:29+0000\n" | ||
| 2047 | 16 | "PO-Revision-Date: 2012-12-21 23:00+0000\n" | ||
| 2048 | 17 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 2049 | 18 | >>>>>>> MERGE-SOURCE | ||
| 2050 | 13 | "Language-Team: Breton <br@li.org>\n" | 19 | "Language-Team: Breton <br@li.org>\n" |
| 2051 | 14 | "MIME-Version: 1.0\n" | 20 | "MIME-Version: 1.0\n" |
| 2052 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 21 | "Content-Type: text/plain; charset=UTF-8\n" |
| 2053 | 16 | "Content-Transfer-Encoding: 8bit\n" | 22 | "Content-Transfer-Encoding: 8bit\n" |
| 2054 | 23 | <<<<<<< TREE | ||
| 2055 | 17 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" | 24 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" |
| 2056 | 18 | "X-Generator: Launchpad (build 16532)\n" | 25 | "X-Generator: Launchpad (build 16532)\n" |
| 2057 | 26 | ======= | ||
| 2058 | 27 | "X-Launchpad-Export-Date: 2013-06-15 06:13+0000\n" | ||
| 2059 | 28 | "X-Generator: Launchpad (build 16667)\n" | ||
| 2060 | 29 | >>>>>>> MERGE-SOURCE | ||
| 2061 | 19 | 30 | ||
| 2062 | 20 | #. module: account | 31 | #. module: account |
| 2063 | 21 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 | 32 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
| 2064 | @@ -128,11 +139,19 @@ | |||
| 2065 | 128 | #: code:addons/account/account.py:641 | 139 | #: code:addons/account/account.py:641 |
| 2066 | 129 | #: code:addons/account/account.py:686 | 140 | #: code:addons/account/account.py:686 |
| 2067 | 130 | #: code:addons/account/account.py:781 | 141 | #: code:addons/account/account.py:781 |
| 2068 | 142 | <<<<<<< TREE | ||
| 2069 | 131 | #: code:addons/account/account.py:1049 | 143 | #: code:addons/account/account.py:1049 |
| 2070 | 132 | #: code:addons/account/account_invoice.py:788 | 144 | #: code:addons/account/account_invoice.py:788 |
| 2071 | 133 | #: code:addons/account/account_invoice.py:791 | 145 | #: code:addons/account/account_invoice.py:791 |
| 2072 | 134 | #: code:addons/account/account_invoice.py:794 | 146 | #: code:addons/account/account_invoice.py:794 |
| 2073 | 135 | #: code:addons/account/account_invoice.py:1514 | 147 | #: code:addons/account/account_invoice.py:1514 |
| 2074 | 148 | ======= | ||
| 2075 | 149 | #: code:addons/account/account.py:1058 | ||
| 2076 | 150 | #: code:addons/account/account_invoice.py:820 | ||
| 2077 | 151 | #: code:addons/account/account_invoice.py:823 | ||
| 2078 | 152 | #: code:addons/account/account_invoice.py:826 | ||
| 2079 | 153 | #: code:addons/account/account_invoice.py:1545 | ||
| 2080 | 154 | >>>>>>> MERGE-SOURCE | ||
| 2081 | 136 | #: code:addons/account/account_move_line.py:98 | 155 | #: code:addons/account/account_move_line.py:98 |
| 2082 | 137 | #: code:addons/account/account_move_line.py:774 | 156 | #: code:addons/account/account_move_line.py:774 |
| 2083 | 138 | #: code:addons/account/account_move_line.py:827 | 157 | #: code:addons/account/account_move_line.py:827 |
| 2084 | @@ -330,7 +349,7 @@ | |||
| 2085 | 330 | msgstr "" | 349 | msgstr "" |
| 2086 | 331 | 350 | ||
| 2087 | 332 | #. module: account | 351 | #. module: account |
| 2089 | 333 | #: code:addons/account/account_invoice.py:74 | 352 | #: code:addons/account/account_invoice.py:77 |
| 2090 | 334 | #, python-format | 353 | #, python-format |
| 2091 | 335 | msgid "You must define an analytic journal of type '%s'!" | 354 | msgid "You must define an analytic journal of type '%s'!" |
| 2092 | 336 | msgstr "" | 355 | msgstr "" |
| 2093 | @@ -586,10 +605,21 @@ | |||
| 2094 | 586 | msgstr "" | 605 | msgstr "" |
| 2095 | 587 | 606 | ||
| 2096 | 588 | #. module: account | 607 | #. module: account |
| 2097 | 608 | <<<<<<< TREE | ||
| 2098 | 589 | #. openerp-web | 609 | #. openerp-web |
| 2099 | 590 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 | 610 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
| 2100 | 591 | #, python-format | 611 | #, python-format |
| 2101 | 592 | msgid "Nothing to reconcile" | 612 | msgid "Nothing to reconcile" |
| 2102 | 613 | ======= | ||
| 2103 | 614 | #: report:account.account.balance:0 | ||
| 2104 | 615 | #: selection:account.balance.report,display_account:0 | ||
| 2105 | 616 | #: selection:account.common.account.report,display_account:0 | ||
| 2106 | 617 | #: report:account.general.ledger_landscape:0 | ||
| 2107 | 618 | #: selection:account.report.general.ledger,display_account:0 | ||
| 2108 | 619 | #: selection:account.tax,type_tax_use:0 | ||
| 2109 | 620 | #: selection:account.tax.template,type_tax_use:0 | ||
| 2110 | 621 | msgid "All" | ||
| 2111 | 622 | >>>>>>> MERGE-SOURCE | ||
| 2112 | 593 | msgstr "" | 623 | msgstr "" |
| 2113 | 594 | 624 | ||
| 2114 | 595 | #. module: account | 625 | #. module: account |
| 2115 | @@ -721,7 +751,9 @@ | |||
| 2116 | 721 | #: selection:account.common.partner.report,result_selection:0 | 751 | #: selection:account.common.partner.report,result_selection:0 |
| 2117 | 722 | #: selection:account.partner.balance,result_selection:0 | 752 | #: selection:account.partner.balance,result_selection:0 |
| 2118 | 723 | #: selection:account.partner.ledger,result_selection:0 | 753 | #: selection:account.partner.ledger,result_selection:0 |
| 2119 | 754 | #: report:account.third_party_ledger:0 | ||
| 2120 | 724 | #: code:addons/account/report/account_partner_balance.py:297 | 755 | #: code:addons/account/report/account_partner_balance.py:297 |
| 2121 | 756 | #: code:addons/account/report/account_partner_ledger.py:272 | ||
| 2122 | 725 | #, python-format | 757 | #, python-format |
| 2123 | 726 | msgid "Receivable Accounts" | 758 | msgid "Receivable Accounts" |
| 2124 | 727 | msgstr "" | 759 | msgstr "" |
| 2125 | @@ -759,7 +791,11 @@ | |||
| 2126 | 759 | msgstr "" | 791 | msgstr "" |
| 2127 | 760 | 792 | ||
| 2128 | 761 | #. module: account | 793 | #. module: account |
| 2129 | 794 | <<<<<<< TREE | ||
| 2130 | 762 | #: code:addons/account/account_invoice.py:1330 | 795 | #: code:addons/account/account_invoice.py:1330 |
| 2131 | 796 | ======= | ||
| 2132 | 797 | #: code:addons/account/account_invoice.py:1361 | ||
| 2133 | 798 | >>>>>>> MERGE-SOURCE | ||
| 2134 | 763 | #, python-format | 799 | #, python-format |
| 2135 | 764 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." | 800 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
| 2136 | 765 | msgstr "" | 801 | msgstr "" |
| 2137 | @@ -828,7 +864,11 @@ | |||
| 2138 | 828 | msgstr "" | 864 | msgstr "" |
| 2139 | 829 | 865 | ||
| 2140 | 830 | #. module: account | 866 | #. module: account |
| 2141 | 867 | <<<<<<< TREE | ||
| 2142 | 831 | #: code:addons/account/account_invoice.py:794 | 868 | #: code:addons/account/account_invoice.py:794 |
| 2143 | 869 | ======= | ||
| 2144 | 870 | #: code:addons/account/account_invoice.py:826 | ||
| 2145 | 871 | >>>>>>> MERGE-SOURCE | ||
| 2146 | 832 | #, python-format | 872 | #, python-format |
| 2147 | 833 | msgid "" | 873 | msgid "" |
| 2148 | 834 | "Taxes are missing!\n" | 874 | "Taxes are missing!\n" |
| 2149 | @@ -1007,7 +1047,11 @@ | |||
| 2150 | 1007 | msgstr "" | 1047 | msgstr "" |
| 2151 | 1008 | 1048 | ||
| 2152 | 1009 | #. module: account | 1049 | #. module: account |
| 2153 | 1050 | <<<<<<< TREE | ||
| 2154 | 1010 | #: code:addons/account/account_invoice.py:867 | 1051 | #: code:addons/account/account_invoice.py:867 |
| 2155 | 1052 | ======= | ||
| 2156 | 1053 | #: code:addons/account/account_invoice.py:899 | ||
| 2157 | 1054 | >>>>>>> MERGE-SOURCE | ||
| 2158 | 1011 | #, python-format | 1055 | #, python-format |
| 2159 | 1012 | msgid "Please define sequence on the journal related to this invoice." | 1056 | msgid "Please define sequence on the journal related to this invoice." |
| 2160 | 1013 | msgstr "" | 1057 | msgstr "" |
| 2161 | @@ -1078,10 +1122,17 @@ | |||
| 2162 | 1078 | msgstr "" | 1122 | msgstr "" |
| 2163 | 1079 | 1123 | ||
| 2164 | 1080 | #. module: account | 1124 | #. module: account |
| 2165 | 1125 | <<<<<<< TREE | ||
| 2166 | 1081 | #: code:addons/account/account.py:2308 | 1126 | #: code:addons/account/account.py:2308 |
| 2167 | 1082 | #: code:addons/account/account_bank_statement.py:423 | 1127 | #: code:addons/account/account_bank_statement.py:423 |
| 2168 | 1083 | #: code:addons/account/account_invoice.py:74 | 1128 | #: code:addons/account/account_invoice.py:74 |
| 2169 | 1084 | #: code:addons/account/account_invoice.py:744 | 1129 | #: code:addons/account/account_invoice.py:744 |
| 2170 | 1130 | ======= | ||
| 2171 | 1131 | #: code:addons/account/account.py:2346 | ||
| 2172 | 1132 | #: code:addons/account/account_bank_statement.py:424 | ||
| 2173 | 1133 | #: code:addons/account/account_invoice.py:77 | ||
| 2174 | 1134 | #: code:addons/account/account_invoice.py:775 | ||
| 2175 | 1135 | >>>>>>> MERGE-SOURCE | ||
| 2176 | 1085 | #: code:addons/account/account_move_line.py:195 | 1136 | #: code:addons/account/account_move_line.py:195 |
| 2177 | 1086 | #, python-format | 1137 | #, python-format |
| 2178 | 1087 | msgid "No Analytic Journal !" | 1138 | msgid "No Analytic Journal !" |
| 2179 | @@ -1510,8 +1561,10 @@ | |||
| 2180 | 1510 | msgstr "" | 1561 | msgstr "" |
| 2181 | 1511 | 1562 | ||
| 2182 | 1512 | #. module: account | 1563 | #. module: account |
| 2183 | 1564 | #: report:account.account.balance:0 | ||
| 2184 | 1513 | #: selection:account.balance.report,display_account:0 | 1565 | #: selection:account.balance.report,display_account:0 |
| 2185 | 1514 | #: selection:account.common.account.report,display_account:0 | 1566 | #: selection:account.common.account.report,display_account:0 |
| 2186 | 1567 | #: report:account.general.ledger_landscape:0 | ||
| 2187 | 1515 | #: selection:account.partner.balance,display_partner:0 | 1568 | #: selection:account.partner.balance,display_partner:0 |
| 2188 | 1516 | #: selection:account.report.general.ledger,display_account:0 | 1569 | #: selection:account.report.general.ledger,display_account:0 |
| 2189 | 1517 | msgid "With balance is not equal to 0" | 1570 | msgid "With balance is not equal to 0" |
| 2190 | @@ -1741,6 +1794,10 @@ | |||
| 2191 | 1741 | #: view:account.invoice:0 | 1794 | #: view:account.invoice:0 |
| 2192 | 1742 | #: view:account.invoice.report:0 | 1795 | #: view:account.invoice.report:0 |
| 2193 | 1743 | #: field:account.move.line,invoice:0 | 1796 | #: field:account.move.line,invoice:0 |
| 2194 | 1797 | <<<<<<< TREE | ||
| 2195 | 1798 | ======= | ||
| 2196 | 1799 | #: code:addons/account/account_invoice.py:1157 | ||
| 2197 | 1800 | >>>>>>> MERGE-SOURCE | ||
| 2198 | 1744 | #: model:ir.model,name:account.model_account_invoice | 1801 | #: model:ir.model,name:account.model_account_invoice |
| 2199 | 1745 | #: model:res.request.link,name:account.req_link_invoice | 1802 | #: model:res.request.link,name:account.req_link_invoice |
| 2200 | 1746 | msgid "Invoice" | 1803 | msgid "Invoice" |
| 2201 | @@ -1989,11 +2046,20 @@ | |||
| 2202 | 1989 | #: code:addons/account/account_bank_statement.py:418 | 2046 | #: code:addons/account/account_bank_statement.py:418 |
| 2203 | 1990 | #: code:addons/account/account_cash_statement.py:256 | 2047 | #: code:addons/account/account_cash_statement.py:256 |
| 2204 | 1991 | #: code:addons/account/account_cash_statement.py:300 | 2048 | #: code:addons/account/account_cash_statement.py:300 |
| 2205 | 2049 | <<<<<<< TREE | ||
| 2206 | 1992 | #: code:addons/account/account_invoice.py:867 | 2050 | #: code:addons/account/account_invoice.py:867 |
| 2207 | 1993 | #: code:addons/account/account_invoice.py:901 | 2051 | #: code:addons/account/account_invoice.py:901 |
| 2208 | 1994 | #: code:addons/account/account_invoice.py:1091 | 2052 | #: code:addons/account/account_invoice.py:1091 |
| 2209 | 1995 | #: code:addons/account/account_move_line.py:578 | 2053 | #: code:addons/account/account_move_line.py:578 |
| 2210 | 1996 | #: code:addons/account/account_move_line.py:831 | 2054 | #: code:addons/account/account_move_line.py:831 |
| 2211 | 2055 | ======= | ||
| 2212 | 2056 | #: code:addons/account/account_invoice.py:899 | ||
| 2213 | 2057 | #: code:addons/account/account_invoice.py:933 | ||
| 2214 | 2058 | #: code:addons/account/account_invoice.py:1124 | ||
| 2215 | 2059 | #: code:addons/account/account_move_line.py:579 | ||
| 2216 | 2060 | #: code:addons/account/account_move_line.py:828 | ||
| 2217 | 2061 | #: code:addons/account/account_move_line.py:851 | ||
| 2218 | 2062 | >>>>>>> MERGE-SOURCE | ||
| 2219 | 1997 | #: code:addons/account/account_move_line.py:854 | 2063 | #: code:addons/account/account_move_line.py:854 |
| 2220 | 1998 | #: code:addons/account/account_move_line.py:857 | 2064 | #: code:addons/account/account_move_line.py:857 |
| 2221 | 1999 | #: code:addons/account/account_move_line.py:1122 | 2065 | #: code:addons/account/account_move_line.py:1122 |
| 2222 | @@ -2227,7 +2293,9 @@ | |||
| 2223 | 2227 | #: selection:account.common.partner.report,result_selection:0 | 2293 | #: selection:account.common.partner.report,result_selection:0 |
| 2224 | 2228 | #: selection:account.partner.balance,result_selection:0 | 2294 | #: selection:account.partner.balance,result_selection:0 |
| 2225 | 2229 | #: selection:account.partner.ledger,result_selection:0 | 2295 | #: selection:account.partner.ledger,result_selection:0 |
| 2226 | 2296 | #: report:account.third_party_ledger:0 | ||
| 2227 | 2230 | #: code:addons/account/report/account_partner_balance.py:299 | 2297 | #: code:addons/account/report/account_partner_balance.py:299 |
| 2228 | 2298 | #: code:addons/account/report/account_partner_ledger.py:274 | ||
| 2229 | 2231 | #, python-format | 2299 | #, python-format |
| 2230 | 2232 | msgid "Payable Accounts" | 2300 | msgid "Payable Accounts" |
| 2231 | 2233 | msgstr "" | 2301 | msgstr "" |
| 2232 | @@ -2532,7 +2600,11 @@ | |||
| 2233 | 2532 | msgstr "" | 2600 | msgstr "" |
| 2234 | 2533 | 2601 | ||
| 2235 | 2534 | #. module: account | 2602 | #. module: account |
| 2236 | 2603 | <<<<<<< TREE | ||
| 2237 | 2535 | #: code:addons/account/account_invoice.py:901 | 2604 | #: code:addons/account/account_invoice.py:901 |
| 2238 | 2605 | ======= | ||
| 2239 | 2606 | #: code:addons/account/account_invoice.py:933 | ||
| 2240 | 2607 | >>>>>>> MERGE-SOURCE | ||
| 2241 | 2536 | #, python-format | 2608 | #, python-format |
| 2242 | 2537 | msgid "" | 2609 | msgid "" |
| 2243 | 2538 | "Cannot create the invoice.\n" | 2610 | "Cannot create the invoice.\n" |
| 2244 | @@ -2797,6 +2869,7 @@ | |||
| 2245 | 2797 | msgstr "" | 2869 | msgstr "" |
| 2246 | 2798 | 2870 | ||
| 2247 | 2799 | #. module: account | 2871 | #. module: account |
| 2248 | 2872 | <<<<<<< TREE | ||
| 2249 | 2800 | #: code:addons/account/account.py:3503 | 2873 | #: code:addons/account/account.py:3503 |
| 2250 | 2801 | #: code:addons/account/account_bank_statement.py:404 | 2874 | #: code:addons/account/account_bank_statement.py:404 |
| 2251 | 2802 | #: code:addons/account/account_invoice.py:378 | 2875 | #: code:addons/account/account_invoice.py:378 |
| 2252 | @@ -2806,6 +2879,16 @@ | |||
| 2253 | 2806 | #: code:addons/account/account_invoice.py:605 | 2879 | #: code:addons/account/account_invoice.py:605 |
| 2254 | 2807 | #: code:addons/account/account_invoice.py:627 | 2880 | #: code:addons/account/account_invoice.py:627 |
| 2255 | 2808 | #: code:addons/account/account_move_line.py:535 | 2881 | #: code:addons/account/account_move_line.py:535 |
| 2256 | 2882 | ======= | ||
| 2257 | 2883 | #: code:addons/account/account.py:3541 | ||
| 2258 | 2884 | #: code:addons/account/account_bank_statement.py:405 | ||
| 2259 | 2885 | #: code:addons/account/account_invoice.py:507 | ||
| 2260 | 2886 | #: code:addons/account/account_invoice.py:609 | ||
| 2261 | 2887 | #: code:addons/account/account_invoice.py:624 | ||
| 2262 | 2888 | #: code:addons/account/account_invoice.py:632 | ||
| 2263 | 2889 | #: code:addons/account/account_invoice.py:657 | ||
| 2264 | 2890 | #: code:addons/account/account_move_line.py:536 | ||
| 2265 | 2891 | >>>>>>> MERGE-SOURCE | ||
| 2266 | 2809 | #, python-format | 2892 | #, python-format |
| 2267 | 2810 | msgid "Configuration Error!" | 2893 | msgid "Configuration Error!" |
| 2268 | 2811 | msgstr "" | 2894 | msgstr "" |
| 2269 | @@ -3028,8 +3111,13 @@ | |||
| 2270 | 3028 | msgstr "" | 3111 | msgstr "" |
| 2271 | 3029 | 3112 | ||
| 2272 | 3030 | #. module: account | 3113 | #. module: account |
| 2273 | 3114 | <<<<<<< TREE | ||
| 2274 | 3031 | #: code:addons/account/account.py:2308 | 3115 | #: code:addons/account/account.py:2308 |
| 2275 | 3032 | #: code:addons/account/account_invoice.py:744 | 3116 | #: code:addons/account/account_invoice.py:744 |
| 2276 | 3117 | ======= | ||
| 2277 | 3118 | #: code:addons/account/account.py:2346 | ||
| 2278 | 3119 | #: code:addons/account/account_invoice.py:775 | ||
| 2279 | 3120 | >>>>>>> MERGE-SOURCE | ||
| 2280 | 3033 | #: code:addons/account/account_move_line.py:195 | 3121 | #: code:addons/account/account_move_line.py:195 |
| 2281 | 3034 | #, python-format | 3122 | #, python-format |
| 2282 | 3035 | msgid "You have to define an analytic journal on the '%s' journal!" | 3123 | msgid "You have to define an analytic journal on the '%s' journal!" |
| 2283 | @@ -3090,6 +3178,11 @@ | |||
| 2284 | 3090 | msgstr "" | 3178 | msgstr "" |
| 2285 | 3091 | 3179 | ||
| 2286 | 3092 | #. module: account | 3180 | #. module: account |
| 2287 | 3181 | #: report:account.journal.period.print:0 | ||
| 2288 | 3182 | msgid "Reference Number" | ||
| 2289 | 3183 | msgstr "" | ||
| 2290 | 3184 | |||
| 2291 | 3185 | #. module: account | ||
| 2292 | 3093 | #: selection:account.entries.report,month:0 | 3186 | #: selection:account.entries.report,month:0 |
| 2293 | 3094 | #: selection:account.invoice.report,month:0 | 3187 | #: selection:account.invoice.report,month:0 |
| 2294 | 3095 | #: selection:analytic.entries.report,month:0 | 3188 | #: selection:analytic.entries.report,month:0 |
| 2295 | @@ -3188,7 +3281,11 @@ | |||
| 2296 | 3188 | msgstr "" | 3281 | msgstr "" |
| 2297 | 3189 | 3282 | ||
| 2298 | 3190 | #. module: account | 3283 | #. module: account |
| 2299 | 3284 | <<<<<<< TREE | ||
| 2300 | 3191 | #: code:addons/account/account_invoice.py:791 | 3285 | #: code:addons/account/account_invoice.py:791 |
| 2301 | 3286 | ======= | ||
| 2302 | 3287 | #: code:addons/account/account_invoice.py:823 | ||
| 2303 | 3288 | >>>>>>> MERGE-SOURCE | ||
| 2304 | 3192 | #, python-format | 3289 | #, python-format |
| 2305 | 3193 | msgid "" | 3290 | msgid "" |
| 2306 | 3194 | "Tax base different!\n" | 3291 | "Tax base different!\n" |
| 2307 | @@ -3344,8 +3441,13 @@ | |||
| 2308 | 3344 | msgstr "" | 3441 | msgstr "" |
| 2309 | 3345 | 3442 | ||
| 2310 | 3346 | #. module: account | 3443 | #. module: account |
| 2311 | 3444 | <<<<<<< TREE | ||
| 2312 | 3347 | #: code:addons/account/account.py:3422 | 3445 | #: code:addons/account/account.py:3422 |
| 2313 | 3348 | #: code:addons/account/account_bank.py:95 | 3446 | #: code:addons/account/account_bank.py:95 |
| 2314 | 3447 | ======= | ||
| 2315 | 3448 | #: code:addons/account/account.py:3460 | ||
| 2316 | 3449 | #: code:addons/account/account_bank.py:94 | ||
| 2317 | 3450 | >>>>>>> MERGE-SOURCE | ||
| 2318 | 3349 | #, python-format | 3451 | #, python-format |
| 2319 | 3350 | msgid "BNK" | 3452 | msgid "BNK" |
| 2320 | 3351 | msgstr "" | 3453 | msgstr "" |
| 2321 | @@ -3601,7 +3703,11 @@ | |||
| 2322 | 3601 | msgstr "" | 3703 | msgstr "" |
| 2323 | 3602 | 3704 | ||
| 2324 | 3603 | #. module: account | 3705 | #. module: account |
| 2325 | 3706 | <<<<<<< TREE | ||
| 2326 | 3604 | #: code:addons/account/account_invoice.py:984 | 3707 | #: code:addons/account/account_invoice.py:984 |
| 2327 | 3708 | ======= | ||
| 2328 | 3709 | #: code:addons/account/account_invoice.py:1016 | ||
| 2329 | 3710 | >>>>>>> MERGE-SOURCE | ||
| 2330 | 3605 | #, python-format | 3711 | #, python-format |
| 2331 | 3606 | msgid "" | 3712 | msgid "" |
| 2332 | 3607 | "You cannot create an invoice on a centralized journal. Uncheck the " | 3713 | "You cannot create an invoice on a centralized journal. Uncheck the " |
| 2333 | @@ -3616,7 +3722,11 @@ | |||
| 2334 | 3616 | msgstr "" | 3722 | msgstr "" |
| 2335 | 3617 | 3723 | ||
| 2336 | 3618 | #. module: account | 3724 | #. module: account |
| 2337 | 3725 | <<<<<<< TREE | ||
| 2338 | 3619 | #: code:addons/account/account_invoice.py:1434 | 3726 | #: code:addons/account/account_invoice.py:1434 |
| 2339 | 3727 | ======= | ||
| 2340 | 3728 | #: code:addons/account/account_invoice.py:1465 | ||
| 2341 | 3729 | >>>>>>> MERGE-SOURCE | ||
| 2342 | 3620 | #, python-format | 3730 | #, python-format |
| 2343 | 3621 | msgid "No Partner Defined !" | 3731 | msgid "No Partner Defined !" |
| 2344 | 3622 | msgstr "" | 3732 | msgstr "" |
| 2345 | @@ -3880,14 +3990,21 @@ | |||
| 2346 | 3880 | msgstr "" | 3990 | msgstr "" |
| 2347 | 3881 | 3991 | ||
| 2348 | 3882 | #. module: account | 3992 | #. module: account |
| 2349 | 3993 | <<<<<<< TREE | ||
| 2350 | 3883 | #: report:account.invoice:0 | 3994 | #: report:account.invoice:0 |
| 2351 | 3884 | msgid "VAT :" | 3995 | msgid "VAT :" |
| 2352 | 3885 | msgstr "" | 3996 | msgstr "" |
| 2353 | 3886 | 3997 | ||
| 2354 | 3887 | #. module: account | 3998 | #. module: account |
| 2355 | 3999 | ======= | ||
| 2356 | 4000 | #: report:account.account.balance:0 | ||
| 2357 | 4001 | >>>>>>> MERGE-SOURCE | ||
| 2358 | 3888 | #: report:account.central.journal:0 | 4002 | #: report:account.central.journal:0 |
| 2359 | 3889 | #: view:account.config.settings:0 | 4003 | #: view:account.config.settings:0 |
| 2360 | 4004 | #: report:account.general.journal:0 | ||
| 2361 | 3890 | #: report:account.general.ledger:0 | 4005 | #: report:account.general.ledger:0 |
| 2362 | 4006 | #: report:account.general.ledger_landscape:0 | ||
| 2363 | 4007 | #: report:account.journal.period.print:0 | ||
| 2364 | 3891 | #: report:account.partner.balance:0 | 4008 | #: report:account.partner.balance:0 |
| 2365 | 3892 | #: report:account.third_party_ledger:0 | 4009 | #: report:account.third_party_ledger:0 |
| 2366 | 3893 | #: report:account.third_party_ledger_other:0 | 4010 | #: report:account.third_party_ledger_other:0 |
| 2367 | @@ -4241,7 +4358,11 @@ | |||
| 2368 | 4241 | msgstr "" | 4358 | msgstr "" |
| 2369 | 4242 | 4359 | ||
| 2370 | 4243 | #. module: account | 4360 | #. module: account |
| 2371 | 4361 | <<<<<<< TREE | ||
| 2372 | 4244 | #: code:addons/account/account_invoice.py:550 | 4362 | #: code:addons/account/account_invoice.py:550 |
| 2373 | 4363 | ======= | ||
| 2374 | 4364 | #: code:addons/account/account_invoice.py:573 | ||
| 2375 | 4365 | >>>>>>> MERGE-SOURCE | ||
| 2376 | 4245 | #: code:addons/account/wizard/account_invoice_refund.py:146 | 4366 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
| 2377 | 4246 | #, python-format | 4367 | #, python-format |
| 2378 | 4247 | msgid "Insufficient Data!" | 4368 | msgid "Insufficient Data!" |
| 2379 | @@ -4508,8 +4629,13 @@ | |||
| 2380 | 4508 | msgstr "" | 4629 | msgstr "" |
| 2381 | 4509 | 4630 | ||
| 2382 | 4510 | #. module: account | 4631 | #. module: account |
| 2383 | 4632 | <<<<<<< TREE | ||
| 2384 | 4511 | #: code:addons/account/account_invoice.py:583 | 4633 | #: code:addons/account/account_invoice.py:583 |
| 2385 | 4512 | #: code:addons/account/account_invoice.py:598 | 4634 | #: code:addons/account/account_invoice.py:598 |
| 2386 | 4635 | ======= | ||
| 2387 | 4636 | #: code:addons/account/account_invoice.py:610 | ||
| 2388 | 4637 | #: code:addons/account/account_invoice.py:625 | ||
| 2389 | 4638 | >>>>>>> MERGE-SOURCE | ||
| 2390 | 4513 | #, python-format | 4639 | #, python-format |
| 2391 | 4514 | msgid "" | 4640 | msgid "" |
| 2392 | 4515 | "Cannot find a chart of account, you should create one from Settings\\" | 4641 | "Cannot find a chart of account, you should create one from Settings\\" |
| 2393 | @@ -4782,7 +4908,11 @@ | |||
| 2394 | 4782 | msgstr "" | 4908 | msgstr "" |
| 2395 | 4783 | 4909 | ||
| 2396 | 4784 | #. module: account | 4910 | #. module: account |
| 2397 | 4911 | <<<<<<< TREE | ||
| 2398 | 4785 | #: code:addons/account/account_invoice.py:627 | 4912 | #: code:addons/account/account_invoice.py:627 |
| 2399 | 4913 | ======= | ||
| 2400 | 4914 | #: code:addons/account/account_invoice.py:658 | ||
| 2401 | 4915 | >>>>>>> MERGE-SOURCE | ||
| 2402 | 4786 | #, python-format | 4916 | #, python-format |
| 2403 | 4787 | msgid "" | 4917 | msgid "" |
| 2404 | 4788 | "Cannot find any account journal of %s type for this company.\n" | 4918 | "Cannot find any account journal of %s type for this company.\n" |
| 2405 | @@ -5106,7 +5236,11 @@ | |||
| 2406 | 5106 | msgstr "" | 5236 | msgstr "" |
| 2407 | 5107 | 5237 | ||
| 2408 | 5108 | #. module: account | 5238 | #. module: account |
| 2409 | 5239 | <<<<<<< TREE | ||
| 2410 | 5109 | #: code:addons/account/account_invoice.py:890 | 5240 | #: code:addons/account/account_invoice.py:890 |
| 2411 | 5241 | ======= | ||
| 2412 | 5242 | #: code:addons/account/account_invoice.py:922 | ||
| 2413 | 5243 | >>>>>>> MERGE-SOURCE | ||
| 2414 | 5110 | #, python-format | 5244 | #, python-format |
| 2415 | 5111 | msgid "" | 5245 | msgid "" |
| 2416 | 5112 | "Please verify the price of the invoice !\n" | 5246 | "Please verify the price of the invoice !\n" |
| 2417 | @@ -5431,7 +5565,11 @@ | |||
| 2418 | 5431 | msgstr "" | 5565 | msgstr "" |
| 2419 | 5432 | 5566 | ||
| 2420 | 5433 | #. module: account | 5567 | #. module: account |
| 2421 | 5568 | <<<<<<< TREE | ||
| 2422 | 5434 | #: code:addons/account/account_invoice.py:485 | 5569 | #: code:addons/account/account_invoice.py:485 |
| 2423 | 5570 | ======= | ||
| 2424 | 5571 | #: code:addons/account/account_invoice.py:508 | ||
| 2425 | 5572 | >>>>>>> MERGE-SOURCE | ||
| 2426 | 5435 | #, python-format | 5573 | #, python-format |
| 2427 | 5436 | msgid "" | 5574 | msgid "" |
| 2428 | 5437 | "Cannot find a chart of accounts for this company, you should create one." | 5575 | "Cannot find a chart of accounts for this company, you should create one." |
| 2429 | @@ -5815,6 +5953,18 @@ | |||
| 2430 | 5815 | msgstr "" | 5953 | msgstr "" |
| 2431 | 5816 | 5954 | ||
| 2432 | 5817 | #. module: account | 5955 | #. module: account |
| 2433 | 5956 | <<<<<<< TREE | ||
| 2434 | 5957 | ======= | ||
| 2435 | 5958 | #: code:addons/account/account_invoice.py:474 | ||
| 2436 | 5959 | #, python-format | ||
| 2437 | 5960 | msgid "" | ||
| 2438 | 5961 | "You cannot delete an invoice after it has been validated (and received a " | ||
| 2439 | 5962 | "number). You can set it back to \"Draft\" state and modify its content, " | ||
| 2440 | 5963 | "then re-confirm it." | ||
| 2441 | 5964 | msgstr "" | ||
| 2442 | 5965 | |||
| 2443 | 5966 | #. module: account | ||
| 2444 | 5967 | >>>>>>> MERGE-SOURCE | ||
| 2445 | 5818 | #: help:account.automatic.reconcile,power:0 | 5968 | #: help:account.automatic.reconcile,power:0 |
| 2446 | 5819 | msgid "" | 5969 | msgid "" |
| 2447 | 5820 | "Number of partial amounts that can be combined to find a balance point can " | 5970 | "Number of partial amounts that can be combined to find a balance point can " |
| 2448 | @@ -5966,7 +6116,11 @@ | |||
| 2449 | 5966 | #: view:account.config.settings:0 | 6116 | #: view:account.config.settings:0 |
| 2450 | 5967 | #: view:account.invoice:0 | 6117 | #: view:account.invoice:0 |
| 2451 | 5968 | #: view:account.invoice.report:0 | 6118 | #: view:account.invoice.report:0 |
| 2452 | 6119 | <<<<<<< TREE | ||
| 2453 | 5969 | #: code:addons/account/account_invoice.py:355 | 6120 | #: code:addons/account/account_invoice.py:355 |
| 2454 | 6121 | ======= | ||
| 2455 | 6122 | #: code:addons/account/account_invoice.py:390 | ||
| 2456 | 6123 | >>>>>>> MERGE-SOURCE | ||
| 2457 | 5970 | #, python-format | 6124 | #, python-format |
| 2458 | 5971 | msgid "Supplier" | 6125 | msgid "Supplier" |
| 2459 | 5972 | msgstr "" | 6126 | msgstr "" |
| 2460 | @@ -5986,7 +6140,7 @@ | |||
| 2461 | 5986 | msgstr "" | 6140 | msgstr "" |
| 2462 | 5987 | 6141 | ||
| 2463 | 5988 | #. module: account | 6142 | #. module: account |
| 2465 | 5989 | #: code:addons/account/account_invoice.py:92 | 6143 | #: code:addons/account/account_invoice.py:95 |
| 2466 | 5990 | #, python-format | 6144 | #, python-format |
| 2467 | 5991 | msgid "Free Reference" | 6145 | msgid "Free Reference" |
| 2468 | 5992 | msgstr "" | 6146 | msgstr "" |
| 2469 | @@ -5996,7 +6150,9 @@ | |||
| 2470 | 5996 | #: selection:account.common.partner.report,result_selection:0 | 6150 | #: selection:account.common.partner.report,result_selection:0 |
| 2471 | 5997 | #: selection:account.partner.balance,result_selection:0 | 6151 | #: selection:account.partner.balance,result_selection:0 |
| 2472 | 5998 | #: selection:account.partner.ledger,result_selection:0 | 6152 | #: selection:account.partner.ledger,result_selection:0 |
| 2473 | 6153 | #: report:account.third_party_ledger:0 | ||
| 2474 | 5999 | #: code:addons/account/report/account_partner_balance.py:301 | 6154 | #: code:addons/account/report/account_partner_balance.py:301 |
| 2475 | 6155 | #: code:addons/account/report/account_partner_ledger.py:276 | ||
| 2476 | 6000 | #, python-format | 6156 | #, python-format |
| 2477 | 6001 | msgid "Receivable and Payable Accounts" | 6157 | msgid "Receivable and Payable Accounts" |
| 2478 | 6002 | msgstr "" | 6158 | msgstr "" |
| 2479 | @@ -6294,7 +6450,11 @@ | |||
| 2480 | 6294 | msgstr "" | 6450 | msgstr "" |
| 2481 | 6295 | 6451 | ||
| 2482 | 6296 | #. module: account | 6452 | #. module: account |
| 2483 | 6453 | <<<<<<< TREE | ||
| 2484 | 6297 | #: code:addons/account/account_invoice.py:1091 | 6454 | #: code:addons/account/account_invoice.py:1091 |
| 2485 | 6455 | ======= | ||
| 2486 | 6456 | #: code:addons/account/account_invoice.py:1124 | ||
| 2487 | 6457 | >>>>>>> MERGE-SOURCE | ||
| 2488 | 6298 | #, python-format | 6458 | #, python-format |
| 2489 | 6299 | msgid "" | 6459 | msgid "" |
| 2490 | 6300 | "You cannot cancel an invoice which is partially paid. You need to " | 6460 | "You cannot cancel an invoice which is partially paid. You need to " |
| 2491 | @@ -6466,7 +6626,11 @@ | |||
| 2492 | 6466 | msgstr "" | 6626 | msgstr "" |
| 2493 | 6467 | 6627 | ||
| 2494 | 6468 | #. module: account | 6628 | #. module: account |
| 2495 | 6629 | <<<<<<< TREE | ||
| 2496 | 6469 | #: code:addons/account/account_invoice.py:606 | 6630 | #: code:addons/account/account_invoice.py:606 |
| 2497 | 6631 | ======= | ||
| 2498 | 6632 | #: code:addons/account/account_invoice.py:633 | ||
| 2499 | 6633 | >>>>>>> MERGE-SOURCE | ||
| 2500 | 6470 | #, python-format | 6634 | #, python-format |
| 2501 | 6471 | msgid "Invoice line account's company and invoice's compnay does not match." | 6635 | msgid "Invoice line account's company and invoice's compnay does not match." |
| 2502 | 6472 | msgstr "" | 6636 | msgstr "" |
| 2503 | @@ -6611,12 +6775,21 @@ | |||
| 2504 | 6611 | msgstr "" | 6775 | msgstr "" |
| 2505 | 6612 | 6776 | ||
| 2506 | 6613 | #. module: account | 6777 | #. module: account |
| 2507 | 6778 | <<<<<<< TREE | ||
| 2508 | 6614 | #: code:addons/account/account.py:1410 | 6779 | #: code:addons/account/account.py:1410 |
| 2509 | 6615 | #: code:addons/account/account.py:1415 | 6780 | #: code:addons/account/account.py:1415 |
| 2510 | 6616 | #: code:addons/account/account.py:1444 | 6781 | #: code:addons/account/account.py:1444 |
| 2511 | 6617 | #: code:addons/account/account.py:1451 | 6782 | #: code:addons/account/account.py:1451 |
| 2512 | 6618 | #: code:addons/account/account_invoice.py:983 | 6783 | #: code:addons/account/account_invoice.py:983 |
| 2513 | 6619 | #: code:addons/account/account_move_line.py:1008 | 6784 | #: code:addons/account/account_move_line.py:1008 |
| 2514 | 6785 | ======= | ||
| 2515 | 6786 | #: code:addons/account/account.py:1448 | ||
| 2516 | 6787 | #: code:addons/account/account.py:1453 | ||
| 2517 | 6788 | #: code:addons/account/account.py:1482 | ||
| 2518 | 6789 | #: code:addons/account/account.py:1489 | ||
| 2519 | 6790 | #: code:addons/account/account_invoice.py:1015 | ||
| 2520 | 6791 | #: code:addons/account/account_move_line.py:1005 | ||
| 2521 | 6792 | >>>>>>> MERGE-SOURCE | ||
| 2522 | 6620 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 | 6793 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
| 2523 | 6621 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 | 6794 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
| 2524 | 6622 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 | 6795 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
| 2525 | @@ -6694,6 +6867,10 @@ | |||
| 2526 | 6694 | #: report:account.invoice:0 | 6867 | #: report:account.invoice:0 |
| 2527 | 6695 | #: selection:account.invoice,type:0 | 6868 | #: selection:account.invoice,type:0 |
| 2528 | 6696 | #: selection:account.invoice.report,type:0 | 6869 | #: selection:account.invoice.report,type:0 |
| 2529 | 6870 | <<<<<<< TREE | ||
| 2530 | 6871 | ======= | ||
| 2531 | 6872 | #: code:addons/account/account_invoice.py:1160 | ||
| 2532 | 6873 | >>>>>>> MERGE-SOURCE | ||
| 2533 | 6697 | #: selection:report.invoice.created,type:0 | 6874 | #: selection:report.invoice.created,type:0 |
| 2534 | 6698 | msgid "Supplier Refund" | 6875 | msgid "Supplier Refund" |
| 2535 | 6699 | msgstr "" | 6876 | msgstr "" |
| 2536 | @@ -7811,7 +7988,11 @@ | |||
| 2537 | 7811 | msgstr "" | 7988 | msgstr "" |
| 2538 | 7812 | 7989 | ||
| 2539 | 7813 | #. module: account | 7990 | #. module: account |
| 2540 | 7991 | <<<<<<< TREE | ||
| 2541 | 7814 | #: code:addons/account/account_invoice.py:788 | 7992 | #: code:addons/account/account_invoice.py:788 |
| 2542 | 7993 | ======= | ||
| 2543 | 7994 | #: code:addons/account/account_invoice.py:820 | ||
| 2544 | 7995 | >>>>>>> MERGE-SOURCE | ||
| 2545 | 7815 | #, python-format | 7996 | #, python-format |
| 2546 | 7816 | msgid "Global taxes defined, but they are not in invoice lines !" | 7997 | msgid "Global taxes defined, but they are not in invoice lines !" |
| 2547 | 7817 | msgstr "" | 7998 | msgstr "" |
| 2548 | @@ -7852,7 +8033,11 @@ | |||
| 2549 | 7852 | #: view:account.config.settings:0 | 8033 | #: view:account.config.settings:0 |
| 2550 | 7853 | #: view:account.invoice:0 | 8034 | #: view:account.invoice:0 |
| 2551 | 7854 | #: view:account.invoice.report:0 | 8035 | #: view:account.invoice.report:0 |
| 2552 | 8036 | <<<<<<< TREE | ||
| 2553 | 7855 | #: code:addons/account/account_invoice.py:353 | 8037 | #: code:addons/account/account_invoice.py:353 |
| 2554 | 8038 | ======= | ||
| 2555 | 8039 | #: code:addons/account/account_invoice.py:388 | ||
| 2556 | 8040 | >>>>>>> MERGE-SOURCE | ||
| 2557 | 7856 | #, python-format | 8041 | #, python-format |
| 2558 | 7857 | msgid "Customer" | 8042 | msgid "Customer" |
| 2559 | 7858 | msgstr "" | 8043 | msgstr "" |
| 2560 | @@ -7986,6 +8171,17 @@ | |||
| 2561 | 7986 | msgstr "" | 8171 | msgstr "" |
| 2562 | 7987 | 8172 | ||
| 2563 | 7988 | #. module: account | 8173 | #. module: account |
| 2564 | 8174 | <<<<<<< TREE | ||
| 2565 | 8175 | ======= | ||
| 2566 | 8176 | #: code:addons/account/account_invoice.py:472 | ||
| 2567 | 8177 | #, python-format | ||
| 2568 | 8178 | msgid "" | ||
| 2569 | 8179 | "You cannot delete an invoice which is not draft or cancelled. You should " | ||
| 2570 | 8180 | "refund it instead." | ||
| 2571 | 8181 | msgstr "" | ||
| 2572 | 8182 | |||
| 2573 | 8183 | #. module: account | ||
| 2574 | 8184 | >>>>>>> MERGE-SOURCE | ||
| 2575 | 7989 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement | 8185 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
| 2576 | 7990 | msgid "Legal Reports" | 8186 | msgid "Legal Reports" |
| 2577 | 7991 | msgstr "" | 8187 | msgstr "" |
| 2578 | @@ -8099,7 +8295,11 @@ | |||
| 2579 | 8099 | msgstr "" | 8295 | msgstr "" |
| 2580 | 8100 | 8296 | ||
| 2581 | 8101 | #. module: account | 8297 | #. module: account |
| 2582 | 8298 | <<<<<<< TREE | ||
| 2583 | 8102 | #: code:addons/account/account_invoice.py:869 | 8299 | #: code:addons/account/account_invoice.py:869 |
| 2584 | 8300 | ======= | ||
| 2585 | 8301 | #: code:addons/account/account_invoice.py:901 | ||
| 2586 | 8302 | >>>>>>> MERGE-SOURCE | ||
| 2587 | 8103 | #, python-format | 8303 | #, python-format |
| 2588 | 8104 | msgid "No Invoice Lines !" | 8304 | msgid "No Invoice Lines !" |
| 2589 | 8105 | msgstr "" | 8305 | msgstr "" |
| 2590 | @@ -8174,7 +8374,11 @@ | |||
| 2591 | 8174 | msgstr "" | 8374 | msgstr "" |
| 2592 | 8175 | 8375 | ||
| 2593 | 8176 | #. module: account | 8376 | #. module: account |
| 2594 | 8377 | <<<<<<< TREE | ||
| 2595 | 8177 | #: code:addons/account/account_invoice.py:1434 | 8378 | #: code:addons/account/account_invoice.py:1434 |
| 2596 | 8379 | ======= | ||
| 2597 | 8380 | #: code:addons/account/account_invoice.py:1465 | ||
| 2598 | 8381 | >>>>>>> MERGE-SOURCE | ||
| 2599 | 8178 | #, python-format | 8382 | #, python-format |
| 2600 | 8179 | msgid "You must first select a partner !" | 8383 | msgid "You must first select a partner !" |
| 2601 | 8180 | msgstr "" | 8384 | msgstr "" |
| 2602 | @@ -9116,7 +9320,11 @@ | |||
| 2603 | 9116 | msgstr "" | 9320 | msgstr "" |
| 2604 | 9117 | 9321 | ||
| 2605 | 9118 | #. module: account | 9322 | #. module: account |
| 2606 | 9323 | <<<<<<< TREE | ||
| 2607 | 9119 | #: code:addons/account/account_invoice.py:869 | 9324 | #: code:addons/account/account_invoice.py:869 |
| 2608 | 9325 | ======= | ||
| 2609 | 9326 | #: code:addons/account/account_invoice.py:901 | ||
| 2610 | 9327 | >>>>>>> MERGE-SOURCE | ||
| 2611 | 9120 | #, python-format | 9328 | #, python-format |
| 2612 | 9121 | msgid "Please create some invoice lines." | 9329 | msgid "Please create some invoice lines." |
| 2613 | 9122 | msgstr "" | 9330 | msgstr "" |
| 2614 | @@ -9670,7 +9878,11 @@ | |||
| 2615 | 9670 | msgstr "" | 9878 | msgstr "" |
| 2616 | 9671 | 9879 | ||
| 2617 | 9672 | #. module: account | 9880 | #. module: account |
| 2618 | 9881 | <<<<<<< TREE | ||
| 2619 | 9673 | #: code:addons/account/account_invoice.py:890 | 9882 | #: code:addons/account/account_invoice.py:890 |
| 2620 | 9883 | ======= | ||
| 2621 | 9884 | #: code:addons/account/account_invoice.py:922 | ||
| 2622 | 9885 | >>>>>>> MERGE-SOURCE | ||
| 2623 | 9674 | #, python-format | 9886 | #, python-format |
| 2624 | 9675 | msgid "Bad total !" | 9887 | msgid "Bad total !" |
| 2625 | 9676 | msgstr "" | 9888 | msgstr "" |
| 2626 | @@ -10141,6 +10353,7 @@ | |||
| 2627 | 10141 | 10353 | ||
| 2628 | 10142 | #. module: account | 10354 | #. module: account |
| 2629 | 10143 | #: field:account.account,company_id:0 | 10355 | #: field:account.account,company_id:0 |
| 2630 | 10356 | #: report:account.account.balance:0 | ||
| 2631 | 10144 | #: field:account.aged.trial.balance,company_id:0 | 10357 | #: field:account.aged.trial.balance,company_id:0 |
| 2632 | 10145 | #: field:account.analytic.journal,company_id:0 | 10358 | #: field:account.analytic.journal,company_id:0 |
| 2633 | 10146 | #: field:account.balance.report,company_id:0 | 10359 | #: field:account.balance.report,company_id:0 |
| 2634 | @@ -10156,7 +10369,9 @@ | |||
| 2635 | 10156 | #: field:account.entries.report,company_id:0 | 10369 | #: field:account.entries.report,company_id:0 |
| 2636 | 10157 | #: field:account.fiscal.position,company_id:0 | 10370 | #: field:account.fiscal.position,company_id:0 |
| 2637 | 10158 | #: field:account.fiscalyear,company_id:0 | 10371 | #: field:account.fiscalyear,company_id:0 |
| 2638 | 10372 | #: report:account.general.journal:0 | ||
| 2639 | 10159 | #: field:account.general.journal,company_id:0 | 10373 | #: field:account.general.journal,company_id:0 |
| 2640 | 10374 | #: report:account.general.ledger_landscape:0 | ||
| 2641 | 10160 | #: field:account.installer,company_id:0 | 10375 | #: field:account.installer,company_id:0 |
| 2642 | 10161 | #: field:account.invoice,company_id:0 | 10376 | #: field:account.invoice,company_id:0 |
| 2643 | 10162 | #: field:account.invoice.line,company_id:0 | 10377 | #: field:account.invoice.line,company_id:0 |
| 2644 | @@ -10165,6 +10380,7 @@ | |||
| 2645 | 10165 | #: field:account.invoice.tax,company_id:0 | 10380 | #: field:account.invoice.tax,company_id:0 |
| 2646 | 10166 | #: field:account.journal,company_id:0 | 10381 | #: field:account.journal,company_id:0 |
| 2647 | 10167 | #: field:account.journal.period,company_id:0 | 10382 | #: field:account.journal.period,company_id:0 |
| 2648 | 10383 | #: report:account.journal.period.print:0 | ||
| 2649 | 10168 | #: field:account.model,company_id:0 | 10384 | #: field:account.model,company_id:0 |
| 2650 | 10169 | #: field:account.move,company_id:0 | 10385 | #: field:account.move,company_id:0 |
| 2651 | 10170 | #: field:account.move.line,company_id:0 | 10386 | #: field:account.move.line,company_id:0 |
| 2652 | @@ -10325,6 +10541,10 @@ | |||
| 2653 | 10325 | #: view:account.invoice:0 | 10541 | #: view:account.invoice:0 |
| 2654 | 10326 | #: selection:account.invoice,type:0 | 10542 | #: selection:account.invoice,type:0 |
| 2655 | 10327 | #: selection:account.invoice.report,type:0 | 10543 | #: selection:account.invoice.report,type:0 |
| 2656 | 10544 | <<<<<<< TREE | ||
| 2657 | 10545 | ======= | ||
| 2658 | 10546 | #: code:addons/account/account_invoice.py:1158 | ||
| 2659 | 10547 | >>>>>>> MERGE-SOURCE | ||
| 2660 | 10328 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 | 10548 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
| 2661 | 10329 | #: selection:report.invoice.created,type:0 | 10549 | #: selection:report.invoice.created,type:0 |
| 2662 | 10330 | msgid "Supplier Invoice" | 10550 | msgid "Supplier Invoice" |
| 2663 | @@ -10412,8 +10632,10 @@ | |||
| 2664 | 10412 | msgstr "" | 10632 | msgstr "" |
| 2665 | 10413 | 10633 | ||
| 2666 | 10414 | #. module: account | 10634 | #. module: account |
| 2667 | 10635 | #: report:account.account.balance:0 | ||
| 2668 | 10415 | #: selection:account.balance.report,display_account:0 | 10636 | #: selection:account.balance.report,display_account:0 |
| 2669 | 10416 | #: selection:account.common.account.report,display_account:0 | 10637 | #: selection:account.common.account.report,display_account:0 |
| 2670 | 10638 | #: report:account.general.ledger_landscape:0 | ||
| 2671 | 10417 | #: selection:account.report.general.ledger,display_account:0 | 10639 | #: selection:account.report.general.ledger,display_account:0 |
| 2672 | 10418 | msgid "With movements" | 10640 | msgid "With movements" |
| 2673 | 10419 | msgstr "" | 10641 | msgstr "" |
| 2674 | @@ -10508,7 +10730,11 @@ | |||
| 2675 | 10508 | msgstr "" | 10730 | msgstr "" |
| 2676 | 10509 | 10731 | ||
| 2677 | 10510 | #. module: account | 10732 | #. module: account |
| 2678 | 10733 | <<<<<<< TREE | ||
| 2679 | 10511 | #: code:addons/account/account_invoice.py:1515 | 10734 | #: code:addons/account/account_invoice.py:1515 |
| 2680 | 10735 | ======= | ||
| 2681 | 10736 | #: code:addons/account/account_invoice.py:1546 | ||
| 2682 | 10737 | >>>>>>> MERGE-SOURCE | ||
| 2683 | 10512 | #, python-format | 10738 | #, python-format |
| 2684 | 10513 | msgid "" | 10739 | msgid "" |
| 2685 | 10514 | "The selected unit of measure is not compatible with the unit of measure of " | 10740 | "The selected unit of measure is not compatible with the unit of measure of " |
| 2686 | @@ -10589,6 +10815,11 @@ | |||
| 2687 | 10589 | #: report:account.invoice:0 | 10815 | #: report:account.invoice:0 |
| 2688 | 10590 | #: view:account.invoice:0 | 10816 | #: view:account.invoice:0 |
| 2689 | 10591 | #: view:account.invoice.report:0 | 10817 | #: view:account.invoice.report:0 |
| 2690 | 10818 | <<<<<<< TREE | ||
| 2691 | 10819 | ======= | ||
| 2692 | 10820 | #: code:addons/account/account_invoice.py:1159 | ||
| 2693 | 10821 | #, python-format | ||
| 2694 | 10822 | >>>>>>> MERGE-SOURCE | ||
| 2695 | 10592 | msgid "Refund" | 10823 | msgid "Refund" |
| 2696 | 10593 | msgstr "" | 10824 | msgstr "" |
| 2697 | 10594 | 10825 | ||
| 2698 | @@ -10659,7 +10890,11 @@ | |||
| 2699 | 10659 | msgstr "" | 10890 | msgstr "" |
| 2700 | 10660 | 10891 | ||
| 2701 | 10661 | #. module: account | 10892 | #. module: account |
| 2702 | 10893 | <<<<<<< TREE | ||
| 2703 | 10662 | #: code:addons/account/account_invoice.py:550 | 10894 | #: code:addons/account/account_invoice.py:550 |
| 2704 | 10895 | ======= | ||
| 2705 | 10896 | #: code:addons/account/account_invoice.py:573 | ||
| 2706 | 10897 | >>>>>>> MERGE-SOURCE | ||
| 2707 | 10663 | #, python-format | 10898 | #, python-format |
| 2708 | 10664 | msgid "The payment term of supplier does not have a payment term line." | 10899 | msgid "The payment term of supplier does not have a payment term line." |
| 2709 | 10665 | msgstr "" | 10900 | msgstr "" |
| 2710 | 10666 | 10901 | ||
| 2711 | === modified file 'account/i18n/bs.po' | |||
| 2712 | --- account/i18n/bs.po 2013-06-13 18:15:03 +0000 | |||
| 2713 | +++ account/i18n/bs.po 2013-06-19 09:20:00 +0000 | |||
| 2714 | @@ -4,17 +4,31 @@ | |||
| 2715 | 4 | # | 4 | # |
| 2716 | 5 | msgid "" | 5 | msgid "" |
| 2717 | 6 | msgstr "" | 6 | msgstr "" |
| 2718 | 7 | <<<<<<< TREE | ||
| 2719 | 7 | "Project-Id-Version: OpenERP Server 6.0dev\n" | 8 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
| 2720 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
| 2721 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
| 2722 | 10 | "PO-Revision-Date: 2012-05-10 18:18+0000\n" | 11 | "PO-Revision-Date: 2012-05-10 18:18+0000\n" |
| 2723 | 11 | "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" | 12 | "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" |
| 2724 | 12 | "Language-Team: \n" | 13 | "Language-Team: \n" |
| 2725 | 14 | ======= | ||
| 2726 | 15 | "Project-Id-Version: openobject-addons\n" | ||
| 2727 | 16 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 2728 | 17 | "POT-Creation-Date: 2013-06-14 22:29+0000\n" | ||
| 2729 | 18 | "PO-Revision-Date: 2012-12-21 23:00+0000\n" | ||
| 2730 | 19 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 2731 | 20 | "Language-Team: Bosnian <bs@li.org>\n" | ||
| 2732 | 21 | >>>>>>> MERGE-SOURCE | ||
| 2733 | 13 | "MIME-Version: 1.0\n" | 22 | "MIME-Version: 1.0\n" |
| 2734 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 23 | "Content-Type: text/plain; charset=UTF-8\n" |
| 2735 | 15 | "Content-Transfer-Encoding: 8bit\n" | 24 | "Content-Transfer-Encoding: 8bit\n" |
| 2736 | 25 | <<<<<<< TREE | ||
| 2737 | 16 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" | 26 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" |
| 2738 | 17 | "X-Generator: Launchpad (build 16532)\n" | 27 | "X-Generator: Launchpad (build 16532)\n" |
| 2739 | 28 | ======= | ||
| 2740 | 29 | "X-Launchpad-Export-Date: 2013-06-15 06:13+0000\n" | ||
| 2741 | 30 | "X-Generator: Launchpad (build 16667)\n" | ||
| 2742 | 31 | >>>>>>> MERGE-SOURCE | ||
| 2743 | 18 | 32 | ||
| 2744 | 19 | #. module: account | 33 | #. module: account |
| 2745 | 20 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 | 34 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
| 2746 | @@ -129,11 +143,19 @@ | |||
| 2747 | 129 | #: code:addons/account/account.py:641 | 143 | #: code:addons/account/account.py:641 |
| 2748 | 130 | #: code:addons/account/account.py:686 | 144 | #: code:addons/account/account.py:686 |
| 2749 | 131 | #: code:addons/account/account.py:781 | 145 | #: code:addons/account/account.py:781 |
| 2750 | 146 | <<<<<<< TREE | ||
| 2751 | 132 | #: code:addons/account/account.py:1049 | 147 | #: code:addons/account/account.py:1049 |
| 2752 | 133 | #: code:addons/account/account_invoice.py:788 | 148 | #: code:addons/account/account_invoice.py:788 |
| 2753 | 134 | #: code:addons/account/account_invoice.py:791 | 149 | #: code:addons/account/account_invoice.py:791 |
| 2754 | 135 | #: code:addons/account/account_invoice.py:794 | 150 | #: code:addons/account/account_invoice.py:794 |
| 2755 | 136 | #: code:addons/account/account_invoice.py:1514 | 151 | #: code:addons/account/account_invoice.py:1514 |
| 2756 | 152 | ======= | ||
| 2757 | 153 | #: code:addons/account/account.py:1058 | ||
| 2758 | 154 | #: code:addons/account/account_invoice.py:820 | ||
| 2759 | 155 | #: code:addons/account/account_invoice.py:823 | ||
| 2760 | 156 | #: code:addons/account/account_invoice.py:826 | ||
| 2761 | 157 | #: code:addons/account/account_invoice.py:1545 | ||
| 2762 | 158 | >>>>>>> MERGE-SOURCE | ||
| 2763 | 137 | #: code:addons/account/account_move_line.py:98 | 159 | #: code:addons/account/account_move_line.py:98 |
| 2764 | 138 | #: code:addons/account/account_move_line.py:774 | 160 | #: code:addons/account/account_move_line.py:774 |
| 2765 | 139 | #: code:addons/account/account_move_line.py:827 | 161 | #: code:addons/account/account_move_line.py:827 |
| 2766 | @@ -331,7 +353,7 @@ | |||
| 2767 | 331 | msgstr "" | 353 | msgstr "" |
| 2768 | 332 | 354 | ||
| 2769 | 333 | #. module: account | 355 | #. module: account |
| 2771 | 334 | #: code:addons/account/account_invoice.py:74 | 356 | #: code:addons/account/account_invoice.py:77 |
| 2772 | 335 | #, python-format | 357 | #, python-format |
| 2773 | 336 | msgid "You must define an analytic journal of type '%s'!" | 358 | msgid "You must define an analytic journal of type '%s'!" |
| 2774 | 337 | msgstr "" | 359 | msgstr "" |
| 2775 | @@ -587,11 +609,23 @@ | |||
| 2776 | 587 | msgstr "" | 609 | msgstr "" |
| 2777 | 588 | 610 | ||
| 2778 | 589 | #. module: account | 611 | #. module: account |
| 2779 | 612 | <<<<<<< TREE | ||
| 2780 | 590 | #. openerp-web | 613 | #. openerp-web |
| 2781 | 591 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 | 614 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
| 2782 | 592 | #, python-format | 615 | #, python-format |
| 2783 | 593 | msgid "Nothing to reconcile" | 616 | msgid "Nothing to reconcile" |
| 2784 | 594 | msgstr "" | 617 | msgstr "" |
| 2785 | 618 | ======= | ||
| 2786 | 619 | #: report:account.account.balance:0 | ||
| 2787 | 620 | #: selection:account.balance.report,display_account:0 | ||
| 2788 | 621 | #: selection:account.common.account.report,display_account:0 | ||
| 2789 | 622 | #: report:account.general.ledger_landscape:0 | ||
| 2790 | 623 | #: selection:account.report.general.ledger,display_account:0 | ||
| 2791 | 624 | #: selection:account.tax,type_tax_use:0 | ||
| 2792 | 625 | #: selection:account.tax.template,type_tax_use:0 | ||
| 2793 | 626 | msgid "All" | ||
| 2794 | 627 | msgstr "Sve" | ||
| 2795 | 628 | >>>>>>> MERGE-SOURCE | ||
| 2796 | 595 | 629 | ||
| 2797 | 596 | #. module: account | 630 | #. module: account |
| 2798 | 597 | #: field:account.config.settings,decimal_precision:0 | 631 | #: field:account.config.settings,decimal_precision:0 |
| 2799 | @@ -722,7 +756,9 @@ | |||
| 2800 | 722 | #: selection:account.common.partner.report,result_selection:0 | 756 | #: selection:account.common.partner.report,result_selection:0 |
| 2801 | 723 | #: selection:account.partner.balance,result_selection:0 | 757 | #: selection:account.partner.balance,result_selection:0 |
| 2802 | 724 | #: selection:account.partner.ledger,result_selection:0 | 758 | #: selection:account.partner.ledger,result_selection:0 |
| 2803 | 759 | #: report:account.third_party_ledger:0 | ||
| 2804 | 725 | #: code:addons/account/report/account_partner_balance.py:297 | 760 | #: code:addons/account/report/account_partner_balance.py:297 |
| 2805 | 761 | #: code:addons/account/report/account_partner_ledger.py:272 | ||
| 2806 | 726 | #, python-format | 762 | #, python-format |
| 2807 | 727 | msgid "Receivable Accounts" | 763 | msgid "Receivable Accounts" |
| 2808 | 728 | msgstr "Potražni računi" | 764 | msgstr "Potražni računi" |
| 2809 | @@ -760,7 +796,11 @@ | |||
| 2810 | 760 | msgstr "Jeste sigurni da želite stvortiti stavke?" | 796 | msgstr "Jeste sigurni da želite stvortiti stavke?" |
| 2811 | 761 | 797 | ||
| 2812 | 762 | #. module: account | 798 | #. module: account |
| 2813 | 799 | <<<<<<< TREE | ||
| 2814 | 763 | #: code:addons/account/account_invoice.py:1330 | 800 | #: code:addons/account/account_invoice.py:1330 |
| 2815 | 801 | ======= | ||
| 2816 | 802 | #: code:addons/account/account_invoice.py:1361 | ||
| 2817 | 803 | >>>>>>> MERGE-SOURCE | ||
| 2818 | 764 | #, python-format | 804 | #, python-format |
| 2819 | 765 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." | 805 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
| 2820 | 766 | msgstr "" | 806 | msgstr "" |
| 2821 | @@ -829,7 +869,11 @@ | |||
| 2822 | 829 | msgstr "Tip" | 869 | msgstr "Tip" |
| 2823 | 830 | 870 | ||
| 2824 | 831 | #. module: account | 871 | #. module: account |
| 2825 | 872 | <<<<<<< TREE | ||
| 2826 | 832 | #: code:addons/account/account_invoice.py:794 | 873 | #: code:addons/account/account_invoice.py:794 |
| 2827 | 874 | ======= | ||
| 2828 | 875 | #: code:addons/account/account_invoice.py:826 | ||
| 2829 | 876 | >>>>>>> MERGE-SOURCE | ||
| 2830 | 833 | #, python-format | 877 | #, python-format |
| 2831 | 834 | msgid "" | 878 | msgid "" |
| 2832 | 835 | "Taxes are missing!\n" | 879 | "Taxes are missing!\n" |
| 2833 | @@ -1008,7 +1052,11 @@ | |||
| 2834 | 1008 | msgstr "Obveza" | 1052 | msgstr "Obveza" |
| 2835 | 1009 | 1053 | ||
| 2836 | 1010 | #. module: account | 1054 | #. module: account |
| 2837 | 1055 | <<<<<<< TREE | ||
| 2838 | 1011 | #: code:addons/account/account_invoice.py:867 | 1056 | #: code:addons/account/account_invoice.py:867 |
| 2839 | 1057 | ======= | ||
| 2840 | 1058 | #: code:addons/account/account_invoice.py:899 | ||
| 2841 | 1059 | >>>>>>> MERGE-SOURCE | ||
| 2842 | 1012 | #, python-format | 1060 | #, python-format |
| 2843 | 1013 | msgid "Please define sequence on the journal related to this invoice." | 1061 | msgid "Please define sequence on the journal related to this invoice." |
| 2844 | 1014 | msgstr "" | 1062 | msgstr "" |
| 2845 | @@ -1079,10 +1127,17 @@ | |||
| 2846 | 1079 | msgstr "" | 1127 | msgstr "" |
| 2847 | 1080 | 1128 | ||
| 2848 | 1081 | #. module: account | 1129 | #. module: account |
| 2849 | 1130 | <<<<<<< TREE | ||
| 2850 | 1082 | #: code:addons/account/account.py:2308 | 1131 | #: code:addons/account/account.py:2308 |
| 2851 | 1083 | #: code:addons/account/account_bank_statement.py:423 | 1132 | #: code:addons/account/account_bank_statement.py:423 |
| 2852 | 1084 | #: code:addons/account/account_invoice.py:74 | 1133 | #: code:addons/account/account_invoice.py:74 |
| 2853 | 1085 | #: code:addons/account/account_invoice.py:744 | 1134 | #: code:addons/account/account_invoice.py:744 |
| 2854 | 1135 | ======= | ||
| 2855 | 1136 | #: code:addons/account/account.py:2346 | ||
| 2856 | 1137 | #: code:addons/account/account_bank_statement.py:424 | ||
| 2857 | 1138 | #: code:addons/account/account_invoice.py:77 | ||
| 2858 | 1139 | #: code:addons/account/account_invoice.py:775 | ||
| 2859 | 1140 | >>>>>>> MERGE-SOURCE | ||
| 2860 | 1086 | #: code:addons/account/account_move_line.py:195 | 1141 | #: code:addons/account/account_move_line.py:195 |
| 2861 | 1087 | #, python-format | 1142 | #, python-format |
| 2862 | 1088 | msgid "No Analytic Journal !" | 1143 | msgid "No Analytic Journal !" |
| 2863 | @@ -1511,8 +1566,10 @@ | |||
| 2864 | 1511 | msgstr "" | 1566 | msgstr "" |
| 2865 | 1512 | 1567 | ||
| 2866 | 1513 | #. module: account | 1568 | #. module: account |
| 2867 | 1569 | #: report:account.account.balance:0 | ||
| 2868 | 1514 | #: selection:account.balance.report,display_account:0 | 1570 | #: selection:account.balance.report,display_account:0 |
| 2869 | 1515 | #: selection:account.common.account.report,display_account:0 | 1571 | #: selection:account.common.account.report,display_account:0 |
| 2870 | 1572 | #: report:account.general.ledger_landscape:0 | ||
| 2871 | 1516 | #: selection:account.partner.balance,display_partner:0 | 1573 | #: selection:account.partner.balance,display_partner:0 |
| 2872 | 1517 | #: selection:account.report.general.ledger,display_account:0 | 1574 | #: selection:account.report.general.ledger,display_account:0 |
| 2873 | 1518 | msgid "With balance is not equal to 0" | 1575 | msgid "With balance is not equal to 0" |
| 2874 | @@ -1742,6 +1799,10 @@ | |||
| 2875 | 1742 | #: view:account.invoice:0 | 1799 | #: view:account.invoice:0 |
| 2876 | 1743 | #: view:account.invoice.report:0 | 1800 | #: view:account.invoice.report:0 |
| 2877 | 1744 | #: field:account.move.line,invoice:0 | 1801 | #: field:account.move.line,invoice:0 |
| 2878 | 1802 | <<<<<<< TREE | ||
| 2879 | 1803 | ======= | ||
| 2880 | 1804 | #: code:addons/account/account_invoice.py:1157 | ||
| 2881 | 1805 | >>>>>>> MERGE-SOURCE | ||
| 2882 | 1745 | #: model:ir.model,name:account.model_account_invoice | 1806 | #: model:ir.model,name:account.model_account_invoice |
| 2883 | 1746 | #: model:res.request.link,name:account.req_link_invoice | 1807 | #: model:res.request.link,name:account.req_link_invoice |
| 2884 | 1747 | msgid "Invoice" | 1808 | msgid "Invoice" |
| 2885 | @@ -1990,11 +2051,20 @@ | |||
| 2886 | 1990 | #: code:addons/account/account_bank_statement.py:418 | 2051 | #: code:addons/account/account_bank_statement.py:418 |
| 2887 | 1991 | #: code:addons/account/account_cash_statement.py:256 | 2052 | #: code:addons/account/account_cash_statement.py:256 |
| 2888 | 1992 | #: code:addons/account/account_cash_statement.py:300 | 2053 | #: code:addons/account/account_cash_statement.py:300 |
| 2889 | 2054 | <<<<<<< TREE | ||
| 2890 | 1993 | #: code:addons/account/account_invoice.py:867 | 2055 | #: code:addons/account/account_invoice.py:867 |
| 2891 | 1994 | #: code:addons/account/account_invoice.py:901 | 2056 | #: code:addons/account/account_invoice.py:901 |
| 2892 | 1995 | #: code:addons/account/account_invoice.py:1091 | 2057 | #: code:addons/account/account_invoice.py:1091 |
| 2893 | 1996 | #: code:addons/account/account_move_line.py:578 | 2058 | #: code:addons/account/account_move_line.py:578 |
| 2894 | 1997 | #: code:addons/account/account_move_line.py:831 | 2059 | #: code:addons/account/account_move_line.py:831 |
| 2895 | 2060 | ======= | ||
| 2896 | 2061 | #: code:addons/account/account_invoice.py:899 | ||
| 2897 | 2062 | #: code:addons/account/account_invoice.py:933 | ||
| 2898 | 2063 | #: code:addons/account/account_invoice.py:1124 | ||
| 2899 | 2064 | #: code:addons/account/account_move_line.py:579 | ||
| 2900 | 2065 | #: code:addons/account/account_move_line.py:828 | ||
| 2901 | 2066 | #: code:addons/account/account_move_line.py:851 | ||
| 2902 | 2067 | >>>>>>> MERGE-SOURCE | ||
| 2903 | 1998 | #: code:addons/account/account_move_line.py:854 | 2068 | #: code:addons/account/account_move_line.py:854 |
| 2904 | 1999 | #: code:addons/account/account_move_line.py:857 | 2069 | #: code:addons/account/account_move_line.py:857 |
| 2905 | 2000 | #: code:addons/account/account_move_line.py:1122 | 2070 | #: code:addons/account/account_move_line.py:1122 |
| 2906 | @@ -2228,7 +2298,9 @@ | |||
| 2907 | 2228 | #: selection:account.common.partner.report,result_selection:0 | 2298 | #: selection:account.common.partner.report,result_selection:0 |
| 2908 | 2229 | #: selection:account.partner.balance,result_selection:0 | 2299 | #: selection:account.partner.balance,result_selection:0 |
| 2909 | 2230 | #: selection:account.partner.ledger,result_selection:0 | 2300 | #: selection:account.partner.ledger,result_selection:0 |
| 2910 | 2301 | #: report:account.third_party_ledger:0 | ||
| 2911 | 2231 | #: code:addons/account/report/account_partner_balance.py:299 | 2302 | #: code:addons/account/report/account_partner_balance.py:299 |
| 2912 | 2303 | #: code:addons/account/report/account_partner_ledger.py:274 | ||
| 2913 | 2232 | #, python-format | 2304 | #, python-format |
| 2914 | 2233 | msgid "Payable Accounts" | 2305 | msgid "Payable Accounts" |
| 2915 | 2234 | msgstr "Dugovni računi" | 2306 | msgstr "Dugovni računi" |
| 2916 | @@ -2533,7 +2605,11 @@ | |||
| 2917 | 2533 | msgstr "" | 2605 | msgstr "" |
| 2918 | 2534 | 2606 | ||
| 2919 | 2535 | #. module: account | 2607 | #. module: account |
| 2920 | 2608 | <<<<<<< TREE | ||
| 2921 | 2536 | #: code:addons/account/account_invoice.py:901 | 2609 | #: code:addons/account/account_invoice.py:901 |
| 2922 | 2610 | ======= | ||
| 2923 | 2611 | #: code:addons/account/account_invoice.py:933 | ||
| 2924 | 2612 | >>>>>>> MERGE-SOURCE | ||
| 2925 | 2537 | #, python-format | 2613 | #, python-format |
| 2926 | 2538 | msgid "" | 2614 | msgid "" |
| 2927 | 2539 | "Cannot create the invoice.\n" | 2615 | "Cannot create the invoice.\n" |
| 2928 | @@ -2803,6 +2879,7 @@ | |||
| 2929 | 2803 | msgstr "" | 2879 | msgstr "" |
| 2930 | 2804 | 2880 | ||
| 2931 | 2805 | #. module: account | 2881 | #. module: account |
| 2932 | 2882 | <<<<<<< TREE | ||
| 2933 | 2806 | #: code:addons/account/account.py:3503 | 2883 | #: code:addons/account/account.py:3503 |
| 2934 | 2807 | #: code:addons/account/account_bank_statement.py:404 | 2884 | #: code:addons/account/account_bank_statement.py:404 |
| 2935 | 2808 | #: code:addons/account/account_invoice.py:378 | 2885 | #: code:addons/account/account_invoice.py:378 |
| 2936 | @@ -2812,6 +2889,16 @@ | |||
| 2937 | 2812 | #: code:addons/account/account_invoice.py:605 | 2889 | #: code:addons/account/account_invoice.py:605 |
| 2938 | 2813 | #: code:addons/account/account_invoice.py:627 | 2890 | #: code:addons/account/account_invoice.py:627 |
| 2939 | 2814 | #: code:addons/account/account_move_line.py:535 | 2891 | #: code:addons/account/account_move_line.py:535 |
| 2940 | 2892 | ======= | ||
| 2941 | 2893 | #: code:addons/account/account.py:3541 | ||
| 2942 | 2894 | #: code:addons/account/account_bank_statement.py:405 | ||
| 2943 | 2895 | #: code:addons/account/account_invoice.py:507 | ||
| 2944 | 2896 | #: code:addons/account/account_invoice.py:609 | ||
| 2945 | 2897 | #: code:addons/account/account_invoice.py:624 | ||
| 2946 | 2898 | #: code:addons/account/account_invoice.py:632 | ||
| 2947 | 2899 | #: code:addons/account/account_invoice.py:657 | ||
| 2948 | 2900 | #: code:addons/account/account_move_line.py:536 | ||
| 2949 | 2901 | >>>>>>> MERGE-SOURCE | ||
| 2950 | 2815 | #, python-format | 2902 | #, python-format |
| 2951 | 2816 | msgid "Configuration Error!" | 2903 | msgid "Configuration Error!" |
| 2952 | 2817 | msgstr "" | 2904 | msgstr "" |
| 2953 | @@ -3034,8 +3121,13 @@ | |||
| 2954 | 3034 | msgstr "" | 3121 | msgstr "" |
| 2955 | 3035 | 3122 | ||
| 2956 | 3036 | #. module: account | 3123 | #. module: account |
| 2957 | 3124 | <<<<<<< TREE | ||
| 2958 | 3037 | #: code:addons/account/account.py:2308 | 3125 | #: code:addons/account/account.py:2308 |
| 2959 | 3038 | #: code:addons/account/account_invoice.py:744 | 3126 | #: code:addons/account/account_invoice.py:744 |
| 2960 | 3127 | ======= | ||
| 2961 | 3128 | #: code:addons/account/account.py:2346 | ||
| 2962 | 3129 | #: code:addons/account/account_invoice.py:775 | ||
| 2963 | 3130 | >>>>>>> MERGE-SOURCE | ||
| 2964 | 3039 | #: code:addons/account/account_move_line.py:195 | 3131 | #: code:addons/account/account_move_line.py:195 |
| 2965 | 3040 | #, python-format | 3132 | #, python-format |
| 2966 | 3041 | msgid "You have to define an analytic journal on the '%s' journal!" | 3133 | msgid "You have to define an analytic journal on the '%s' journal!" |
| 2967 | @@ -3096,6 +3188,11 @@ | |||
| 2968 | 3096 | msgstr "" | 3188 | msgstr "" |
| 2969 | 3097 | 3189 | ||
| 2970 | 3098 | #. module: account | 3190 | #. module: account |
| 2971 | 3191 | #: report:account.journal.period.print:0 | ||
| 2972 | 3192 | msgid "Reference Number" | ||
| 2973 | 3193 | msgstr "Broj reference" | ||
| 2974 | 3194 | |||
| 2975 | 3195 | #. module: account | ||
| 2976 | 3099 | #: selection:account.entries.report,month:0 | 3196 | #: selection:account.entries.report,month:0 |
| 2977 | 3100 | #: selection:account.invoice.report,month:0 | 3197 | #: selection:account.invoice.report,month:0 |
| 2978 | 3101 | #: selection:analytic.entries.report,month:0 | 3198 | #: selection:analytic.entries.report,month:0 |
| 2979 | @@ -3194,7 +3291,11 @@ | |||
| 2980 | 3194 | msgstr "Fiskalna pozicija" | 3291 | msgstr "Fiskalna pozicija" |
| 2981 | 3195 | 3292 | ||
| 2982 | 3196 | #. module: account | 3293 | #. module: account |
| 2983 | 3294 | <<<<<<< TREE | ||
| 2984 | 3197 | #: code:addons/account/account_invoice.py:791 | 3295 | #: code:addons/account/account_invoice.py:791 |
| 2985 | 3296 | ======= | ||
| 2986 | 3297 | #: code:addons/account/account_invoice.py:823 | ||
| 2987 | 3298 | >>>>>>> MERGE-SOURCE | ||
| 2988 | 3198 | #, python-format | 3299 | #, python-format |
| 2989 | 3199 | msgid "" | 3300 | msgid "" |
| 2990 | 3200 | "Tax base different!\n" | 3301 | "Tax base different!\n" |
| 2991 | @@ -3355,8 +3456,13 @@ | |||
| 2992 | 3355 | msgstr "Prikaz" | 3456 | msgstr "Prikaz" |
| 2993 | 3356 | 3457 | ||
| 2994 | 3357 | #. module: account | 3458 | #. module: account |
| 2995 | 3459 | <<<<<<< TREE | ||
| 2996 | 3358 | #: code:addons/account/account.py:3422 | 3460 | #: code:addons/account/account.py:3422 |
| 2997 | 3359 | #: code:addons/account/account_bank.py:95 | 3461 | #: code:addons/account/account_bank.py:95 |
| 2998 | 3462 | ======= | ||
| 2999 | 3463 | #: code:addons/account/account.py:3460 | ||
| 3000 | 3464 | #: code:addons/account/account_bank.py:94 | ||
| 3001 | 3465 | >>>>>>> MERGE-SOURCE | ||
| 3002 | 3360 | #, python-format | 3466 | #, python-format |
| 3003 | 3361 | msgid "BNK" | 3467 | msgid "BNK" |
| 3004 | 3362 | msgstr "" | 3468 | msgstr "" |
| 3005 | @@ -3612,7 +3718,11 @@ | |||
| 3006 | 3612 | msgstr "" | 3718 | msgstr "" |
| 3007 | 3613 | 3719 | ||
| 3008 | 3614 | #. module: account | 3720 | #. module: account |
| 3009 | 3721 | <<<<<<< TREE | ||
| 3010 | 3615 | #: code:addons/account/account_invoice.py:984 | 3722 | #: code:addons/account/account_invoice.py:984 |
| 3011 | 3723 | ======= | ||
| 3012 | 3724 | #: code:addons/account/account_invoice.py:1016 | ||
| 3013 | 3725 | >>>>>>> MERGE-SOURCE | ||
| 3014 | 3616 | #, python-format | 3726 | #, python-format |
| 3015 | 3617 | msgid "" | 3727 | msgid "" |
| 3016 | 3618 | "You cannot create an invoice on a centralized journal. Uncheck the " | 3728 | "You cannot create an invoice on a centralized journal. Uncheck the " |
| 3017 | @@ -3627,7 +3737,11 @@ | |||
| 3018 | 3627 | msgstr "Početni saldo" | 3737 | msgstr "Početni saldo" |
| 3019 | 3628 | 3738 | ||
| 3020 | 3629 | #. module: account | 3739 | #. module: account |
| 3021 | 3740 | <<<<<<< TREE | ||
| 3022 | 3630 | #: code:addons/account/account_invoice.py:1434 | 3741 | #: code:addons/account/account_invoice.py:1434 |
| 3023 | 3742 | ======= | ||
| 3024 | 3743 | #: code:addons/account/account_invoice.py:1465 | ||
| 3025 | 3744 | >>>>>>> MERGE-SOURCE | ||
| 3026 | 3631 | #, python-format | 3745 | #, python-format |
| 3027 | 3632 | msgid "No Partner Defined !" | 3746 | msgid "No Partner Defined !" |
| 3028 | 3633 | msgstr "" | 3747 | msgstr "" |
| 3029 | @@ -3891,14 +4005,21 @@ | |||
| 3030 | 3891 | msgstr "" | 4005 | msgstr "" |
| 3031 | 3892 | 4006 | ||
| 3032 | 3893 | #. module: account | 4007 | #. module: account |
| 3033 | 4008 | <<<<<<< TREE | ||
| 3034 | 3894 | #: report:account.invoice:0 | 4009 | #: report:account.invoice:0 |
| 3035 | 3895 | msgid "VAT :" | 4010 | msgid "VAT :" |
| 3036 | 3896 | msgstr "PDV:" | 4011 | msgstr "PDV:" |
| 3037 | 3897 | 4012 | ||
| 3038 | 3898 | #. module: account | 4013 | #. module: account |
| 3039 | 4014 | ======= | ||
| 3040 | 4015 | #: report:account.account.balance:0 | ||
| 3041 | 4016 | >>>>>>> MERGE-SOURCE | ||
| 3042 | 3899 | #: report:account.central.journal:0 | 4017 | #: report:account.central.journal:0 |
| 3043 | 3900 | #: view:account.config.settings:0 | 4018 | #: view:account.config.settings:0 |
| 3044 | 4019 | #: report:account.general.journal:0 | ||
| 3045 | 3901 | #: report:account.general.ledger:0 | 4020 | #: report:account.general.ledger:0 |
| 3046 | 4021 | #: report:account.general.ledger_landscape:0 | ||
| 3047 | 4022 | #: report:account.journal.period.print:0 | ||
| 3048 | 3902 | #: report:account.partner.balance:0 | 4023 | #: report:account.partner.balance:0 |
| 3049 | 3903 | #: report:account.third_party_ledger:0 | 4024 | #: report:account.third_party_ledger:0 |
| 3050 | 3904 | #: report:account.third_party_ledger_other:0 | 4025 | #: report:account.third_party_ledger_other:0 |
| 3051 | @@ -4256,7 +4377,11 @@ | |||
| 3052 | 4256 | msgstr "Konsolidirani potomci" | 4377 | msgstr "Konsolidirani potomci" |
| 3053 | 4257 | 4378 | ||
| 3054 | 4258 | #. module: account | 4379 | #. module: account |
| 3055 | 4380 | <<<<<<< TREE | ||
| 3056 | 4259 | #: code:addons/account/account_invoice.py:550 | 4381 | #: code:addons/account/account_invoice.py:550 |
| 3057 | 4382 | ======= | ||
| 3058 | 4383 | #: code:addons/account/account_invoice.py:573 | ||
| 3059 | 4384 | >>>>>>> MERGE-SOURCE | ||
| 3060 | 4260 | #: code:addons/account/wizard/account_invoice_refund.py:146 | 4385 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
| 3061 | 4261 | #, python-format | 4386 | #, python-format |
| 3062 | 4262 | msgid "Insufficient Data!" | 4387 | msgid "Insufficient Data!" |
| 3063 | @@ -4523,8 +4648,13 @@ | |||
| 3064 | 4523 | msgstr "" | 4648 | msgstr "" |
| 3065 | 4524 | 4649 | ||
| 3066 | 4525 | #. module: account | 4650 | #. module: account |
| 3067 | 4651 | <<<<<<< TREE | ||
| 3068 | 4526 | #: code:addons/account/account_invoice.py:583 | 4652 | #: code:addons/account/account_invoice.py:583 |
| 3069 | 4527 | #: code:addons/account/account_invoice.py:598 | 4653 | #: code:addons/account/account_invoice.py:598 |
| 3070 | 4654 | ======= | ||
| 3071 | 4655 | #: code:addons/account/account_invoice.py:610 | ||
| 3072 | 4656 | #: code:addons/account/account_invoice.py:625 | ||
| 3073 | 4657 | >>>>>>> MERGE-SOURCE | ||
| 3074 | 4528 | #, python-format | 4658 | #, python-format |
| 3075 | 4529 | msgid "" | 4659 | msgid "" |
| 3076 | 4530 | "Cannot find a chart of account, you should create one from Settings\\" | 4660 | "Cannot find a chart of account, you should create one from Settings\\" |
| 3077 | @@ -4797,7 +4927,11 @@ | |||
| 3078 | 4797 | msgstr "" | 4927 | msgstr "" |
| 3079 | 4798 | 4928 | ||
| 3080 | 4799 | #. module: account | 4929 | #. module: account |
| 3081 | 4930 | <<<<<<< TREE | ||
| 3082 | 4800 | #: code:addons/account/account_invoice.py:627 | 4931 | #: code:addons/account/account_invoice.py:627 |
| 3083 | 4932 | ======= | ||
| 3084 | 4933 | #: code:addons/account/account_invoice.py:658 | ||
| 3085 | 4934 | >>>>>>> MERGE-SOURCE | ||
| 3086 | 4801 | #, python-format | 4935 | #, python-format |
| 3087 | 4802 | msgid "" | 4936 | msgid "" |
| 3088 | 4803 | "Cannot find any account journal of %s type for this company.\n" | 4937 | "Cannot find any account journal of %s type for this company.\n" |
| 3089 | @@ -5121,7 +5255,11 @@ | |||
| 3090 | 5121 | msgstr "Porezna prijava" | 5255 | msgstr "Porezna prijava" |
| 3091 | 5122 | 5256 | ||
| 3092 | 5123 | #. module: account | 5257 | #. module: account |
| 3093 | 5258 | <<<<<<< TREE | ||
| 3094 | 5124 | #: code:addons/account/account_invoice.py:890 | 5259 | #: code:addons/account/account_invoice.py:890 |
| 3095 | 5260 | ======= | ||
| 3096 | 5261 | #: code:addons/account/account_invoice.py:922 | ||
| 3097 | 5262 | >>>>>>> MERGE-SOURCE | ||
| 3098 | 5125 | #, python-format | 5263 | #, python-format |
| 3099 | 5126 | msgid "" | 5264 | msgid "" |
| 3100 | 5127 | "Please verify the price of the invoice !\n" | 5265 | "Please verify the price of the invoice !\n" |
| 3101 | @@ -5448,7 +5586,11 @@ | |||
| 3102 | 5448 | msgstr "Kod za izračunavanje (ako je tip=Python kod)" | 5586 | msgstr "Kod za izračunavanje (ako je tip=Python kod)" |
| 3103 | 5449 | 5587 | ||
| 3104 | 5450 | #. module: account | 5588 | #. module: account |
| 3105 | 5589 | <<<<<<< TREE | ||
| 3106 | 5451 | #: code:addons/account/account_invoice.py:485 | 5590 | #: code:addons/account/account_invoice.py:485 |
| 3107 | 5591 | ======= | ||
| 3108 | 5592 | #: code:addons/account/account_invoice.py:508 | ||
| 3109 | 5593 | >>>>>>> MERGE-SOURCE | ||
| 3110 | 5452 | #, python-format | 5594 | #, python-format |
| 3111 | 5453 | msgid "" | 5595 | msgid "" |
| 3112 | 5454 | "Cannot find a chart of accounts for this company, you should create one." | 5596 | "Cannot find a chart of accounts for this company, you should create one." |
| 3113 | @@ -5834,6 +5976,18 @@ | |||
| 3114 | 5834 | msgstr "" | 5976 | msgstr "" |
| 3115 | 5835 | 5977 | ||
| 3116 | 5836 | #. module: account | 5978 | #. module: account |
| 3117 | 5979 | <<<<<<< TREE | ||
| 3118 | 5980 | ======= | ||
| 3119 | 5981 | #: code:addons/account/account_invoice.py:474 | ||
| 3120 | 5982 | #, python-format | ||
| 3121 | 5983 | msgid "" | ||
| 3122 | 5984 | "You cannot delete an invoice after it has been validated (and received a " | ||
| 3123 | 5985 | "number). You can set it back to \"Draft\" state and modify its content, " | ||
| 3124 | 5986 | "then re-confirm it." | ||
| 3125 | 5987 | msgstr "" | ||
| 3126 | 5988 | |||
| 3127 | 5989 | #. module: account | ||
| 3128 | 5990 | >>>>>>> MERGE-SOURCE | ||
| 3129 | 5837 | #: help:account.automatic.reconcile,power:0 | 5991 | #: help:account.automatic.reconcile,power:0 |
| 3130 | 5838 | msgid "" | 5992 | msgid "" |
| 3131 | 5839 | "Number of partial amounts that can be combined to find a balance point can " | 5993 | "Number of partial amounts that can be combined to find a balance point can " |
| 3132 | @@ -5985,7 +6139,11 @@ | |||
| 3133 | 5985 | #: view:account.config.settings:0 | 6139 | #: view:account.config.settings:0 |
| 3134 | 5986 | #: view:account.invoice:0 | 6140 | #: view:account.invoice:0 |
| 3135 | 5987 | #: view:account.invoice.report:0 | 6141 | #: view:account.invoice.report:0 |
| 3136 | 6142 | <<<<<<< TREE | ||
| 3137 | 5988 | #: code:addons/account/account_invoice.py:355 | 6143 | #: code:addons/account/account_invoice.py:355 |
| 3138 | 6144 | ======= | ||
| 3139 | 6145 | #: code:addons/account/account_invoice.py:390 | ||
| 3140 | 6146 | >>>>>>> MERGE-SOURCE | ||
| 3141 | 5989 | #, python-format | 6147 | #, python-format |
| 3142 | 5990 | msgid "Supplier" | 6148 | msgid "Supplier" |
| 3143 | 5991 | msgstr "Dobavljač" | 6149 | msgstr "Dobavljač" |
| 3144 | @@ -6005,7 +6163,7 @@ | |||
| 3145 | 6005 | msgstr "Broj računa" | 6163 | msgstr "Broj računa" |
| 3146 | 6006 | 6164 | ||
| 3147 | 6007 | #. module: account | 6165 | #. module: account |
| 3149 | 6008 | #: code:addons/account/account_invoice.py:92 | 6166 | #: code:addons/account/account_invoice.py:95 |
| 3150 | 6009 | #, python-format | 6167 | #, python-format |
| 3151 | 6010 | msgid "Free Reference" | 6168 | msgid "Free Reference" |
| 3152 | 6011 | msgstr "" | 6169 | msgstr "" |
| 3153 | @@ -6015,7 +6173,9 @@ | |||
| 3154 | 6015 | #: selection:account.common.partner.report,result_selection:0 | 6173 | #: selection:account.common.partner.report,result_selection:0 |
| 3155 | 6016 | #: selection:account.partner.balance,result_selection:0 | 6174 | #: selection:account.partner.balance,result_selection:0 |
| 3156 | 6017 | #: selection:account.partner.ledger,result_selection:0 | 6175 | #: selection:account.partner.ledger,result_selection:0 |
| 3157 | 6176 | #: report:account.third_party_ledger:0 | ||
| 3158 | 6018 | #: code:addons/account/report/account_partner_balance.py:301 | 6177 | #: code:addons/account/report/account_partner_balance.py:301 |
| 3159 | 6178 | #: code:addons/account/report/account_partner_ledger.py:276 | ||
| 3160 | 6019 | #, python-format | 6179 | #, python-format |
| 3161 | 6020 | msgid "Receivable and Payable Accounts" | 6180 | msgid "Receivable and Payable Accounts" |
| 3162 | 6021 | msgstr "Konta potraživanja i dugovanja" | 6181 | msgstr "Konta potraživanja i dugovanja" |
| 3163 | @@ -6313,7 +6473,11 @@ | |||
| 3164 | 6313 | msgstr "" | 6473 | msgstr "" |
| 3165 | 6314 | 6474 | ||
| 3166 | 6315 | #. module: account | 6475 | #. module: account |
| 3167 | 6476 | <<<<<<< TREE | ||
| 3168 | 6316 | #: code:addons/account/account_invoice.py:1091 | 6477 | #: code:addons/account/account_invoice.py:1091 |
| 3169 | 6478 | ======= | ||
| 3170 | 6479 | #: code:addons/account/account_invoice.py:1124 | ||
| 3171 | 6480 | >>>>>>> MERGE-SOURCE | ||
| 3172 | 6317 | #, python-format | 6481 | #, python-format |
| 3173 | 6318 | msgid "" | 6482 | msgid "" |
| 3174 | 6319 | "You cannot cancel an invoice which is partially paid. You need to " | 6483 | "You cannot cancel an invoice which is partially paid. You need to " |
| 3175 | @@ -6486,7 +6650,11 @@ | |||
| 3176 | 6486 | msgstr "" | 6650 | msgstr "" |
| 3177 | 6487 | 6651 | ||
| 3178 | 6488 | #. module: account | 6652 | #. module: account |
| 3179 | 6653 | <<<<<<< TREE | ||
| 3180 | 6489 | #: code:addons/account/account_invoice.py:606 | 6654 | #: code:addons/account/account_invoice.py:606 |
| 3181 | 6655 | ======= | ||
| 3182 | 6656 | #: code:addons/account/account_invoice.py:633 | ||
| 3183 | 6657 | >>>>>>> MERGE-SOURCE | ||
| 3184 | 6490 | #, python-format | 6658 | #, python-format |
| 3185 | 6491 | msgid "Invoice line account's company and invoice's compnay does not match." | 6659 | msgid "Invoice line account's company and invoice's compnay does not match." |
| 3186 | 6492 | msgstr "" | 6660 | msgstr "" |
| 3187 | @@ -6634,12 +6802,21 @@ | |||
| 3188 | 6634 | "slućaju, redosljed evaluacije je bitan." | 6802 | "slućaju, redosljed evaluacije je bitan." |
| 3189 | 6635 | 6803 | ||
| 3190 | 6636 | #. module: account | 6804 | #. module: account |
| 3191 | 6805 | <<<<<<< TREE | ||
| 3192 | 6637 | #: code:addons/account/account.py:1410 | 6806 | #: code:addons/account/account.py:1410 |
| 3193 | 6638 | #: code:addons/account/account.py:1415 | 6807 | #: code:addons/account/account.py:1415 |
| 3194 | 6639 | #: code:addons/account/account.py:1444 | 6808 | #: code:addons/account/account.py:1444 |
| 3195 | 6640 | #: code:addons/account/account.py:1451 | 6809 | #: code:addons/account/account.py:1451 |
| 3196 | 6641 | #: code:addons/account/account_invoice.py:983 | 6810 | #: code:addons/account/account_invoice.py:983 |
| 3197 | 6642 | #: code:addons/account/account_move_line.py:1008 | 6811 | #: code:addons/account/account_move_line.py:1008 |
| 3198 | 6812 | ======= | ||
| 3199 | 6813 | #: code:addons/account/account.py:1448 | ||
| 3200 | 6814 | #: code:addons/account/account.py:1453 | ||
| 3201 | 6815 | #: code:addons/account/account.py:1482 | ||
| 3202 | 6816 | #: code:addons/account/account.py:1489 | ||
| 3203 | 6817 | #: code:addons/account/account_invoice.py:1015 | ||
| 3204 | 6818 | #: code:addons/account/account_move_line.py:1005 | ||
| 3205 | 6819 | >>>>>>> MERGE-SOURCE | ||
| 3206 | 6643 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 | 6820 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
| 3207 | 6644 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 | 6821 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
| 3208 | 6645 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 | 6822 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
| 3209 | @@ -6717,6 +6894,10 @@ | |||
| 3210 | 6717 | #: report:account.invoice:0 | 6894 | #: report:account.invoice:0 |
| 3211 | 6718 | #: selection:account.invoice,type:0 | 6895 | #: selection:account.invoice,type:0 |
| 3212 | 6719 | #: selection:account.invoice.report,type:0 | 6896 | #: selection:account.invoice.report,type:0 |
| 3213 | 6897 | <<<<<<< TREE | ||
| 3214 | 6898 | ======= | ||
| 3215 | 6899 | #: code:addons/account/account_invoice.py:1160 | ||
| 3216 | 6900 | >>>>>>> MERGE-SOURCE | ||
| 3217 | 6720 | #: selection:report.invoice.created,type:0 | 6901 | #: selection:report.invoice.created,type:0 |
| 3218 | 6721 | msgid "Supplier Refund" | 6902 | msgid "Supplier Refund" |
| 3219 | 6722 | msgstr "Povrat dobavljaču" | 6903 | msgstr "Povrat dobavljaču" |
| 3220 | @@ -7843,7 +8024,11 @@ | |||
| 3221 | 7843 | msgstr "" | 8024 | msgstr "" |
| 3222 | 7844 | 8025 | ||
| 3223 | 7845 | #. module: account | 8026 | #. module: account |
| 3224 | 8027 | <<<<<<< TREE | ||
| 3225 | 7846 | #: code:addons/account/account_invoice.py:788 | 8028 | #: code:addons/account/account_invoice.py:788 |
| 3226 | 8029 | ======= | ||
| 3227 | 8030 | #: code:addons/account/account_invoice.py:820 | ||
| 3228 | 8031 | >>>>>>> MERGE-SOURCE | ||
| 3229 | 7847 | #, python-format | 8032 | #, python-format |
| 3230 | 7848 | msgid "Global taxes defined, but they are not in invoice lines !" | 8033 | msgid "Global taxes defined, but they are not in invoice lines !" |
| 3231 | 7849 | msgstr "" | 8034 | msgstr "" |
| 3232 | @@ -7884,7 +8069,11 @@ | |||
| 3233 | 7884 | #: view:account.config.settings:0 | 8069 | #: view:account.config.settings:0 |
| 3234 | 7885 | #: view:account.invoice:0 | 8070 | #: view:account.invoice:0 |
| 3235 | 7886 | #: view:account.invoice.report:0 | 8071 | #: view:account.invoice.report:0 |
| 3236 | 8072 | <<<<<<< TREE | ||
| 3237 | 7887 | #: code:addons/account/account_invoice.py:353 | 8073 | #: code:addons/account/account_invoice.py:353 |
| 3238 | 8074 | ======= | ||
| 3239 | 8075 | #: code:addons/account/account_invoice.py:388 | ||
| 3240 | 8076 | >>>>>>> MERGE-SOURCE | ||
| 3241 | 7888 | #, python-format | 8077 | #, python-format |
| 3242 | 7889 | msgid "Customer" | 8078 | msgid "Customer" |
| 3243 | 7890 | msgstr "Kupac" | 8079 | msgstr "Kupac" |
| 3244 | @@ -8021,6 +8210,17 @@ | |||
| 3245 | 8021 | msgstr "Transakcije za usklađivanje" | 8210 | msgstr "Transakcije za usklađivanje" |
| 3246 | 8022 | 8211 | ||
| 3247 | 8023 | #. module: account | 8212 | #. module: account |
| 3248 | 8213 | <<<<<<< TREE | ||
| 3249 | 8214 | ======= | ||
| 3250 | 8215 | #: code:addons/account/account_invoice.py:472 | ||
| 3251 | 8216 | #, python-format | ||
| 3252 | 8217 | msgid "" | ||
| 3253 | 8218 | "You cannot delete an invoice which is not draft or cancelled. You should " | ||
| 3254 | 8219 | "refund it instead." | ||
| 3255 | 8220 | msgstr "" | ||
| 3256 | 8221 | |||
| 3257 | 8222 | #. module: account | ||
| 3258 | 8223 | >>>>>>> MERGE-SOURCE | ||
| 3259 | 8024 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement | 8224 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
| 3260 | 8025 | msgid "Legal Reports" | 8225 | msgid "Legal Reports" |
| 3261 | 8026 | msgstr "" | 8226 | msgstr "" |
| 3262 | @@ -8137,7 +8337,11 @@ | |||
| 3263 | 8137 | msgstr "" | 8337 | msgstr "" |
| 3264 | 8138 | 8338 | ||
| 3265 | 8139 | #. module: account | 8339 | #. module: account |
| 3266 | 8340 | <<<<<<< TREE | ||
| 3267 | 8140 | #: code:addons/account/account_invoice.py:869 | 8341 | #: code:addons/account/account_invoice.py:869 |
| 3268 | 8342 | ======= | ||
| 3269 | 8343 | #: code:addons/account/account_invoice.py:901 | ||
| 3270 | 8344 | >>>>>>> MERGE-SOURCE | ||
| 3271 | 8141 | #, python-format | 8345 | #, python-format |
| 3272 | 8142 | msgid "No Invoice Lines !" | 8346 | msgid "No Invoice Lines !" |
| 3273 | 8143 | msgstr "" | 8347 | msgstr "" |
| 3274 | @@ -8212,7 +8416,11 @@ | |||
| 3275 | 8212 | msgstr "Vezani partner" | 8416 | msgstr "Vezani partner" |
| 3276 | 8213 | 8417 | ||
| 3277 | 8214 | #. module: account | 8418 | #. module: account |
| 3278 | 8419 | <<<<<<< TREE | ||
| 3279 | 8215 | #: code:addons/account/account_invoice.py:1434 | 8420 | #: code:addons/account/account_invoice.py:1434 |
| 3280 | 8421 | ======= | ||
| 3281 | 8422 | #: code:addons/account/account_invoice.py:1465 | ||
| 3282 | 8423 | >>>>>>> MERGE-SOURCE | ||
| 3283 | 8216 | #, python-format | 8424 | #, python-format |
| 3284 | 8217 | msgid "You must first select a partner !" | 8425 | msgid "You must first select a partner !" |
| 3285 | 8218 | msgstr "" | 8426 | msgstr "" |
| 3286 | @@ -9159,7 +9367,11 @@ | |||
| 3287 | 9159 | msgstr "" | 9367 | msgstr "" |
| 3288 | 9160 | 9368 | ||
| 3289 | 9161 | #. module: account | 9369 | #. module: account |
| 3290 | 9370 | <<<<<<< TREE | ||
| 3291 | 9162 | #: code:addons/account/account_invoice.py:869 | 9371 | #: code:addons/account/account_invoice.py:869 |
| 3292 | 9372 | ======= | ||
| 3293 | 9373 | #: code:addons/account/account_invoice.py:901 | ||
| 3294 | 9374 | >>>>>>> MERGE-SOURCE | ||
| 3295 | 9163 | #, python-format | 9375 | #, python-format |
| 3296 | 9164 | msgid "Please create some invoice lines." | 9376 | msgid "Please create some invoice lines." |
| 3297 | 9165 | msgstr "" | 9377 | msgstr "" |
| 3298 | @@ -9713,7 +9925,11 @@ | |||
| 3299 | 9713 | msgstr "Neusklađen" | 9925 | msgstr "Neusklađen" |
| 3300 | 9714 | 9926 | ||
| 3301 | 9715 | #. module: account | 9927 | #. module: account |
| 3302 | 9928 | <<<<<<< TREE | ||
| 3303 | 9716 | #: code:addons/account/account_invoice.py:890 | 9929 | #: code:addons/account/account_invoice.py:890 |
| 3304 | 9930 | ======= | ||
| 3305 | 9931 | #: code:addons/account/account_invoice.py:922 | ||
| 3306 | 9932 | >>>>>>> MERGE-SOURCE | ||
| 3307 | 9717 | #, python-format | 9933 | #, python-format |
| 3308 | 9718 | msgid "Bad total !" | 9934 | msgid "Bad total !" |
| 3309 | 9719 | msgstr "" | 9935 | msgstr "" |
| 3310 | @@ -10186,6 +10402,7 @@ | |||
| 3311 | 10186 | 10402 | ||
| 3312 | 10187 | #. module: account | 10403 | #. module: account |
| 3313 | 10188 | #: field:account.account,company_id:0 | 10404 | #: field:account.account,company_id:0 |
| 3314 | 10405 | #: report:account.account.balance:0 | ||
| 3315 | 10189 | #: field:account.aged.trial.balance,company_id:0 | 10406 | #: field:account.aged.trial.balance,company_id:0 |
| 3316 | 10190 | #: field:account.analytic.journal,company_id:0 | 10407 | #: field:account.analytic.journal,company_id:0 |
| 3317 | 10191 | #: field:account.balance.report,company_id:0 | 10408 | #: field:account.balance.report,company_id:0 |
| 3318 | @@ -10201,7 +10418,9 @@ | |||
| 3319 | 10201 | #: field:account.entries.report,company_id:0 | 10418 | #: field:account.entries.report,company_id:0 |
| 3320 | 10202 | #: field:account.fiscal.position,company_id:0 | 10419 | #: field:account.fiscal.position,company_id:0 |
| 3321 | 10203 | #: field:account.fiscalyear,company_id:0 | 10420 | #: field:account.fiscalyear,company_id:0 |
| 3322 | 10421 | #: report:account.general.journal:0 | ||
| 3323 | 10204 | #: field:account.general.journal,company_id:0 | 10422 | #: field:account.general.journal,company_id:0 |
| 3324 | 10423 | #: report:account.general.ledger_landscape:0 | ||
| 3325 | 10205 | #: field:account.installer,company_id:0 | 10424 | #: field:account.installer,company_id:0 |
| 3326 | 10206 | #: field:account.invoice,company_id:0 | 10425 | #: field:account.invoice,company_id:0 |
| 3327 | 10207 | #: field:account.invoice.line,company_id:0 | 10426 | #: field:account.invoice.line,company_id:0 |
| 3328 | @@ -10210,6 +10429,7 @@ | |||
| 3329 | 10210 | #: field:account.invoice.tax,company_id:0 | 10429 | #: field:account.invoice.tax,company_id:0 |
| 3330 | 10211 | #: field:account.journal,company_id:0 | 10430 | #: field:account.journal,company_id:0 |
| 3331 | 10212 | #: field:account.journal.period,company_id:0 | 10431 | #: field:account.journal.period,company_id:0 |
| 3332 | 10432 | #: report:account.journal.period.print:0 | ||
| 3333 | 10213 | #: field:account.model,company_id:0 | 10433 | #: field:account.model,company_id:0 |
| 3334 | 10214 | #: field:account.move,company_id:0 | 10434 | #: field:account.move,company_id:0 |
| 3335 | 10215 | #: field:account.move.line,company_id:0 | 10435 | #: field:account.move.line,company_id:0 |
| 3336 | @@ -10370,6 +10590,10 @@ | |||
| 3337 | 10370 | #: view:account.invoice:0 | 10590 | #: view:account.invoice:0 |
| 3338 | 10371 | #: selection:account.invoice,type:0 | 10591 | #: selection:account.invoice,type:0 |
| 3339 | 10372 | #: selection:account.invoice.report,type:0 | 10592 | #: selection:account.invoice.report,type:0 |
| 3340 | 10593 | <<<<<<< TREE | ||
| 3341 | 10594 | ======= | ||
| 3342 | 10595 | #: code:addons/account/account_invoice.py:1158 | ||
| 3343 | 10596 | >>>>>>> MERGE-SOURCE | ||
| 3344 | 10373 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 | 10597 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
| 3345 | 10374 | #: selection:report.invoice.created,type:0 | 10598 | #: selection:report.invoice.created,type:0 |
| 3346 | 10375 | msgid "Supplier Invoice" | 10599 | msgid "Supplier Invoice" |
| 3347 | @@ -10457,8 +10681,10 @@ | |||
| 3348 | 10457 | msgstr "" | 10681 | msgstr "" |
| 3349 | 10458 | 10682 | ||
| 3350 | 10459 | #. module: account | 10683 | #. module: account |
| 3351 | 10684 | #: report:account.account.balance:0 | ||
| 3352 | 10460 | #: selection:account.balance.report,display_account:0 | 10685 | #: selection:account.balance.report,display_account:0 |
| 3353 | 10461 | #: selection:account.common.account.report,display_account:0 | 10686 | #: selection:account.common.account.report,display_account:0 |
| 3354 | 10687 | #: report:account.general.ledger_landscape:0 | ||
| 3355 | 10462 | #: selection:account.report.general.ledger,display_account:0 | 10688 | #: selection:account.report.general.ledger,display_account:0 |
| 3356 | 10463 | msgid "With movements" | 10689 | msgid "With movements" |
| 3357 | 10464 | msgstr "Sa kretanjima" | 10690 | msgstr "Sa kretanjima" |
| 3358 | @@ -10553,7 +10779,11 @@ | |||
| 3359 | 10553 | msgstr "" | 10779 | msgstr "" |
| 3360 | 10554 | 10780 | ||
| 3361 | 10555 | #. module: account | 10781 | #. module: account |
| 3362 | 10782 | <<<<<<< TREE | ||
| 3363 | 10556 | #: code:addons/account/account_invoice.py:1515 | 10783 | #: code:addons/account/account_invoice.py:1515 |
| 3364 | 10784 | ======= | ||
| 3365 | 10785 | #: code:addons/account/account_invoice.py:1546 | ||
| 3366 | 10786 | >>>>>>> MERGE-SOURCE | ||
| 3367 | 10557 | #, python-format | 10787 | #, python-format |
| 3368 | 10558 | msgid "" | 10788 | msgid "" |
| 3369 | 10559 | "The selected unit of measure is not compatible with the unit of measure of " | 10789 | "The selected unit of measure is not compatible with the unit of measure of " |
| 3370 | @@ -10634,6 +10864,11 @@ | |||
| 3371 | 10634 | #: report:account.invoice:0 | 10864 | #: report:account.invoice:0 |
| 3372 | 10635 | #: view:account.invoice:0 | 10865 | #: view:account.invoice:0 |
| 3373 | 10636 | #: view:account.invoice.report:0 | 10866 | #: view:account.invoice.report:0 |
| 3374 | 10867 | <<<<<<< TREE | ||
| 3375 | 10868 | ======= | ||
| 3376 | 10869 | #: code:addons/account/account_invoice.py:1159 | ||
| 3377 | 10870 | #, python-format | ||
| 3378 | 10871 | >>>>>>> MERGE-SOURCE | ||
| 3379 | 10637 | msgid "Refund" | 10872 | msgid "Refund" |
| 3380 | 10638 | msgstr "Povrat" | 10873 | msgstr "Povrat" |
| 3381 | 10639 | 10874 | ||
| 3382 | @@ -10704,7 +10939,11 @@ | |||
| 3383 | 10704 | msgstr "Ručni porezi fakture" | 10939 | msgstr "Ručni porezi fakture" |
| 3384 | 10705 | 10940 | ||
| 3385 | 10706 | #. module: account | 10941 | #. module: account |
| 3386 | 10942 | <<<<<<< TREE | ||
| 3387 | 10707 | #: code:addons/account/account_invoice.py:550 | 10943 | #: code:addons/account/account_invoice.py:550 |
| 3388 | 10944 | ======= | ||
| 3389 | 10945 | #: code:addons/account/account_invoice.py:573 | ||
| 3390 | 10946 | >>>>>>> MERGE-SOURCE | ||
| 3391 | 10708 | #, python-format | 10947 | #, python-format |
| 3392 | 10709 | msgid "The payment term of supplier does not have a payment term line." | 10948 | msgid "The payment term of supplier does not have a payment term line." |
| 3393 | 10710 | msgstr "" | 10949 | msgstr "" |
| 3394 | 10711 | 10950 | ||
| 3395 | === modified file 'account/i18n/ca.po' | |||
| 3396 | --- account/i18n/ca.po 2013-06-13 18:15:03 +0000 | |||
| 3397 | +++ account/i18n/ca.po 2013-06-19 09:20:00 +0000 | |||
| 3398 | @@ -4,17 +4,31 @@ | |||
| 3399 | 4 | # | 4 | # |
| 3400 | 5 | msgid "" | 5 | msgid "" |
| 3401 | 6 | msgstr "" | 6 | msgstr "" |
| 3402 | 7 | <<<<<<< TREE | ||
| 3403 | 7 | "Project-Id-Version: OpenERP Server 6.0dev\n" | 8 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
| 3404 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 9 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
| 3405 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
| 3406 | 10 | "PO-Revision-Date: 2013-03-01 14:12+0000\n" | 11 | "PO-Revision-Date: 2013-03-01 14:12+0000\n" |
| 3407 | 11 | "Last-Translator: Florenci Solà - Solatec <Unknown>\n" | 12 | "Last-Translator: Florenci Solà - Solatec <Unknown>\n" |
| 3408 | 12 | "Language-Team: \n" | 13 | "Language-Team: \n" |
| 3409 | 14 | ======= | ||
| 3410 | 15 | "Project-Id-Version: openobject-addons\n" | ||
| 3411 | 16 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 3412 | 17 | "POT-Creation-Date: 2013-06-14 22:29+0000\n" | ||
| 3413 | 18 | "PO-Revision-Date: 2012-12-21 23:00+0000\n" | ||
| 3414 | 19 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 3415 | 20 | "Language-Team: Catalan <ca@li.org>\n" | ||
| 3416 | 21 | >>>>>>> MERGE-SOURCE | ||
| 3417 | 13 | "MIME-Version: 1.0\n" | 22 | "MIME-Version: 1.0\n" |
| 3418 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 23 | "Content-Type: text/plain; charset=UTF-8\n" |
| 3419 | 15 | "Content-Transfer-Encoding: 8bit\n" | 24 | "Content-Transfer-Encoding: 8bit\n" |
| 3420 | 25 | <<<<<<< TREE | ||
| 3421 | 16 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" | 26 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" |
| 3422 | 17 | "X-Generator: Launchpad (build 16532)\n" | 27 | "X-Generator: Launchpad (build 16532)\n" |
| 3423 | 28 | ======= | ||
| 3424 | 29 | "X-Launchpad-Export-Date: 2013-06-15 06:14+0000\n" | ||
| 3425 | 30 | "X-Generator: Launchpad (build 16667)\n" | ||
| 3426 | 31 | >>>>>>> MERGE-SOURCE | ||
| 3427 | 18 | 32 | ||
| 3428 | 19 | #. module: account | 33 | #. module: account |
| 3429 | 20 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 | 34 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
| 3430 | @@ -135,11 +149,19 @@ | |||
| 3431 | 135 | #: code:addons/account/account.py:641 | 149 | #: code:addons/account/account.py:641 |
| 3432 | 136 | #: code:addons/account/account.py:686 | 150 | #: code:addons/account/account.py:686 |
| 3433 | 137 | #: code:addons/account/account.py:781 | 151 | #: code:addons/account/account.py:781 |
| 3434 | 152 | <<<<<<< TREE | ||
| 3435 | 138 | #: code:addons/account/account.py:1049 | 153 | #: code:addons/account/account.py:1049 |
| 3436 | 139 | #: code:addons/account/account_invoice.py:788 | 154 | #: code:addons/account/account_invoice.py:788 |
| 3437 | 140 | #: code:addons/account/account_invoice.py:791 | 155 | #: code:addons/account/account_invoice.py:791 |
| 3438 | 141 | #: code:addons/account/account_invoice.py:794 | 156 | #: code:addons/account/account_invoice.py:794 |
| 3439 | 142 | #: code:addons/account/account_invoice.py:1514 | 157 | #: code:addons/account/account_invoice.py:1514 |
| 3440 | 158 | ======= | ||
| 3441 | 159 | #: code:addons/account/account.py:1058 | ||
| 3442 | 160 | #: code:addons/account/account_invoice.py:820 | ||
| 3443 | 161 | #: code:addons/account/account_invoice.py:823 | ||
| 3444 | 162 | #: code:addons/account/account_invoice.py:826 | ||
| 3445 | 163 | #: code:addons/account/account_invoice.py:1545 | ||
| 3446 | 164 | >>>>>>> MERGE-SOURCE | ||
| 3447 | 143 | #: code:addons/account/account_move_line.py:98 | 165 | #: code:addons/account/account_move_line.py:98 |
| 3448 | 144 | #: code:addons/account/account_move_line.py:774 | 166 | #: code:addons/account/account_move_line.py:774 |
| 3449 | 145 | #: code:addons/account/account_move_line.py:827 | 167 | #: code:addons/account/account_move_line.py:827 |
| 3450 | @@ -345,7 +367,7 @@ | |||
| 3451 | 345 | msgstr "" | 367 | msgstr "" |
| 3452 | 346 | 368 | ||
| 3453 | 347 | #. module: account | 369 | #. module: account |
| 3455 | 348 | #: code:addons/account/account_invoice.py:74 | 370 | #: code:addons/account/account_invoice.py:77 |
| 3456 | 349 | #, python-format | 371 | #, python-format |
| 3457 | 350 | msgid "You must define an analytic journal of type '%s'!" | 372 | msgid "You must define an analytic journal of type '%s'!" |
| 3458 | 351 | msgstr "" | 373 | msgstr "" |
| 3459 | @@ -601,11 +623,23 @@ | |||
| 3460 | 601 | msgstr "El comptable confirma l'extracte." | 623 | msgstr "El comptable confirma l'extracte." |
| 3461 | 602 | 624 | ||
| 3462 | 603 | #. module: account | 625 | #. module: account |
| 3463 | 626 | <<<<<<< TREE | ||
| 3464 | 604 | #. openerp-web | 627 | #. openerp-web |
| 3465 | 605 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 | 628 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
| 3466 | 606 | #, python-format | 629 | #, python-format |
| 3467 | 607 | msgid "Nothing to reconcile" | 630 | msgid "Nothing to reconcile" |
| 3468 | 608 | msgstr "" | 631 | msgstr "" |
| 3469 | 632 | ======= | ||
| 3470 | 633 | #: report:account.account.balance:0 | ||
| 3471 | 634 | #: selection:account.balance.report,display_account:0 | ||
| 3472 | 635 | #: selection:account.common.account.report,display_account:0 | ||
| 3473 | 636 | #: report:account.general.ledger_landscape:0 | ||
| 3474 | 637 | #: selection:account.report.general.ledger,display_account:0 | ||
| 3475 | 638 | #: selection:account.tax,type_tax_use:0 | ||
| 3476 | 639 | #: selection:account.tax.template,type_tax_use:0 | ||
| 3477 | 640 | msgid "All" | ||
| 3478 | 641 | msgstr "Tots" | ||
| 3479 | 642 | >>>>>>> MERGE-SOURCE | ||
| 3480 | 609 | 643 | ||
| 3481 | 610 | #. module: account | 644 | #. module: account |
| 3482 | 611 | #: field:account.config.settings,decimal_precision:0 | 645 | #: field:account.config.settings,decimal_precision:0 |
| 3483 | @@ -736,7 +770,9 @@ | |||
| 3484 | 736 | #: selection:account.common.partner.report,result_selection:0 | 770 | #: selection:account.common.partner.report,result_selection:0 |
| 3485 | 737 | #: selection:account.partner.balance,result_selection:0 | 771 | #: selection:account.partner.balance,result_selection:0 |
| 3486 | 738 | #: selection:account.partner.ledger,result_selection:0 | 772 | #: selection:account.partner.ledger,result_selection:0 |
| 3487 | 773 | #: report:account.third_party_ledger:0 | ||
| 3488 | 739 | #: code:addons/account/report/account_partner_balance.py:297 | 774 | #: code:addons/account/report/account_partner_balance.py:297 |
| 3489 | 775 | #: code:addons/account/report/account_partner_ledger.py:272 | ||
| 3490 | 740 | #, python-format | 776 | #, python-format |
| 3491 | 741 | msgid "Receivable Accounts" | 777 | msgid "Receivable Accounts" |
| 3492 | 742 | msgstr "Comptes a cobrar" | 778 | msgstr "Comptes a cobrar" |
| 3493 | @@ -774,7 +810,11 @@ | |||
| 3494 | 774 | msgstr "Esteu segurs que voleu crear els assentaments?" | 810 | msgstr "Esteu segurs que voleu crear els assentaments?" |
| 3495 | 775 | 811 | ||
| 3496 | 776 | #. module: account | 812 | #. module: account |
| 3497 | 813 | <<<<<<< TREE | ||
| 3498 | 777 | #: code:addons/account/account_invoice.py:1330 | 814 | #: code:addons/account/account_invoice.py:1330 |
| 3499 | 815 | ======= | ||
| 3500 | 816 | #: code:addons/account/account_invoice.py:1361 | ||
| 3501 | 817 | >>>>>>> MERGE-SOURCE | ||
| 3502 | 778 | #, python-format | 818 | #, python-format |
| 3503 | 779 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." | 819 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
| 3504 | 780 | msgstr "" | 820 | msgstr "" |
| 3505 | @@ -843,7 +883,11 @@ | |||
| 3506 | 843 | msgstr "Tipus" | 883 | msgstr "Tipus" |
| 3507 | 844 | 884 | ||
| 3508 | 845 | #. module: account | 885 | #. module: account |
| 3509 | 886 | <<<<<<< TREE | ||
| 3510 | 846 | #: code:addons/account/account_invoice.py:794 | 887 | #: code:addons/account/account_invoice.py:794 |
| 3511 | 888 | ======= | ||
| 3512 | 889 | #: code:addons/account/account_invoice.py:826 | ||
| 3513 | 890 | >>>>>>> MERGE-SOURCE | ||
| 3514 | 847 | #, python-format | 891 | #, python-format |
| 3515 | 848 | msgid "" | 892 | msgid "" |
| 3516 | 849 | "Taxes are missing!\n" | 893 | "Taxes are missing!\n" |
| 3517 | @@ -1022,7 +1066,11 @@ | |||
| 3518 | 1022 | msgstr "Passiu" | 1066 | msgstr "Passiu" |
| 3519 | 1023 | 1067 | ||
| 3520 | 1024 | #. module: account | 1068 | #. module: account |
| 3521 | 1069 | <<<<<<< TREE | ||
| 3522 | 1025 | #: code:addons/account/account_invoice.py:867 | 1070 | #: code:addons/account/account_invoice.py:867 |
| 3523 | 1071 | ======= | ||
| 3524 | 1072 | #: code:addons/account/account_invoice.py:899 | ||
| 3525 | 1073 | >>>>>>> MERGE-SOURCE | ||
| 3526 | 1026 | #, python-format | 1074 | #, python-format |
| 3527 | 1027 | msgid "Please define sequence on the journal related to this invoice." | 1075 | msgid "Please define sequence on the journal related to this invoice." |
| 3528 | 1028 | msgstr "" | 1076 | msgstr "" |
| 3529 | @@ -1096,10 +1144,17 @@ | |||
| 3530 | 1096 | msgstr "" | 1144 | msgstr "" |
| 3531 | 1097 | 1145 | ||
| 3532 | 1098 | #. module: account | 1146 | #. module: account |
| 3533 | 1147 | <<<<<<< TREE | ||
| 3534 | 1099 | #: code:addons/account/account.py:2308 | 1148 | #: code:addons/account/account.py:2308 |
| 3535 | 1100 | #: code:addons/account/account_bank_statement.py:423 | 1149 | #: code:addons/account/account_bank_statement.py:423 |
| 3536 | 1101 | #: code:addons/account/account_invoice.py:74 | 1150 | #: code:addons/account/account_invoice.py:74 |
| 3537 | 1102 | #: code:addons/account/account_invoice.py:744 | 1151 | #: code:addons/account/account_invoice.py:744 |
| 3538 | 1152 | ======= | ||
| 3539 | 1153 | #: code:addons/account/account.py:2346 | ||
| 3540 | 1154 | #: code:addons/account/account_bank_statement.py:424 | ||
| 3541 | 1155 | #: code:addons/account/account_invoice.py:77 | ||
| 3542 | 1156 | #: code:addons/account/account_invoice.py:775 | ||
| 3543 | 1157 | >>>>>>> MERGE-SOURCE | ||
| 3544 | 1103 | #: code:addons/account/account_move_line.py:195 | 1158 | #: code:addons/account/account_move_line.py:195 |
| 3545 | 1104 | #, python-format | 1159 | #, python-format |
| 3546 | 1105 | msgid "No Analytic Journal !" | 1160 | msgid "No Analytic Journal !" |
| 3547 | @@ -1531,8 +1586,10 @@ | |||
| 3548 | 1531 | msgstr "" | 1586 | msgstr "" |
| 3549 | 1532 | 1587 | ||
| 3550 | 1533 | #. module: account | 1588 | #. module: account |
| 3551 | 1589 | #: report:account.account.balance:0 | ||
| 3552 | 1534 | #: selection:account.balance.report,display_account:0 | 1590 | #: selection:account.balance.report,display_account:0 |
| 3553 | 1535 | #: selection:account.common.account.report,display_account:0 | 1591 | #: selection:account.common.account.report,display_account:0 |
| 3554 | 1592 | #: report:account.general.ledger_landscape:0 | ||
| 3555 | 1536 | #: selection:account.partner.balance,display_partner:0 | 1593 | #: selection:account.partner.balance,display_partner:0 |
| 3556 | 1537 | #: selection:account.report.general.ledger,display_account:0 | 1594 | #: selection:account.report.general.ledger,display_account:0 |
| 3557 | 1538 | msgid "With balance is not equal to 0" | 1595 | msgid "With balance is not equal to 0" |
| 3558 | @@ -1762,6 +1819,10 @@ | |||
| 3559 | 1762 | #: view:account.invoice:0 | 1819 | #: view:account.invoice:0 |
| 3560 | 1763 | #: view:account.invoice.report:0 | 1820 | #: view:account.invoice.report:0 |
| 3561 | 1764 | #: field:account.move.line,invoice:0 | 1821 | #: field:account.move.line,invoice:0 |
| 3562 | 1822 | <<<<<<< TREE | ||
| 3563 | 1823 | ======= | ||
| 3564 | 1824 | #: code:addons/account/account_invoice.py:1157 | ||
| 3565 | 1825 | >>>>>>> MERGE-SOURCE | ||
| 3566 | 1765 | #: model:ir.model,name:account.model_account_invoice | 1826 | #: model:ir.model,name:account.model_account_invoice |
| 3567 | 1766 | #: model:res.request.link,name:account.req_link_invoice | 1827 | #: model:res.request.link,name:account.req_link_invoice |
| 3568 | 1767 | msgid "Invoice" | 1828 | msgid "Invoice" |
| 3569 | @@ -2012,11 +2073,20 @@ | |||
| 3570 | 2012 | #: code:addons/account/account_bank_statement.py:418 | 2073 | #: code:addons/account/account_bank_statement.py:418 |
| 3571 | 2013 | #: code:addons/account/account_cash_statement.py:256 | 2074 | #: code:addons/account/account_cash_statement.py:256 |
| 3572 | 2014 | #: code:addons/account/account_cash_statement.py:300 | 2075 | #: code:addons/account/account_cash_statement.py:300 |
| 3573 | 2076 | <<<<<<< TREE | ||
| 3574 | 2015 | #: code:addons/account/account_invoice.py:867 | 2077 | #: code:addons/account/account_invoice.py:867 |
| 3575 | 2016 | #: code:addons/account/account_invoice.py:901 | 2078 | #: code:addons/account/account_invoice.py:901 |
| 3576 | 2017 | #: code:addons/account/account_invoice.py:1091 | 2079 | #: code:addons/account/account_invoice.py:1091 |
| 3577 | 2018 | #: code:addons/account/account_move_line.py:578 | 2080 | #: code:addons/account/account_move_line.py:578 |
| 3578 | 2019 | #: code:addons/account/account_move_line.py:831 | 2081 | #: code:addons/account/account_move_line.py:831 |
| 3579 | 2082 | ======= | ||
| 3580 | 2083 | #: code:addons/account/account_invoice.py:899 | ||
| 3581 | 2084 | #: code:addons/account/account_invoice.py:933 | ||
| 3582 | 2085 | #: code:addons/account/account_invoice.py:1124 | ||
| 3583 | 2086 | #: code:addons/account/account_move_line.py:579 | ||
| 3584 | 2087 | #: code:addons/account/account_move_line.py:828 | ||
| 3585 | 2088 | #: code:addons/account/account_move_line.py:851 | ||
| 3586 | 2089 | >>>>>>> MERGE-SOURCE | ||
| 3587 | 2020 | #: code:addons/account/account_move_line.py:854 | 2090 | #: code:addons/account/account_move_line.py:854 |
| 3588 | 2021 | #: code:addons/account/account_move_line.py:857 | 2091 | #: code:addons/account/account_move_line.py:857 |
| 3589 | 2022 | #: code:addons/account/account_move_line.py:1122 | 2092 | #: code:addons/account/account_move_line.py:1122 |
| 3590 | @@ -2252,7 +2322,9 @@ | |||
| 3591 | 2252 | #: selection:account.common.partner.report,result_selection:0 | 2322 | #: selection:account.common.partner.report,result_selection:0 |
| 3592 | 2253 | #: selection:account.partner.balance,result_selection:0 | 2323 | #: selection:account.partner.balance,result_selection:0 |
| 3593 | 2254 | #: selection:account.partner.ledger,result_selection:0 | 2324 | #: selection:account.partner.ledger,result_selection:0 |
| 3594 | 2325 | #: report:account.third_party_ledger:0 | ||
| 3595 | 2255 | #: code:addons/account/report/account_partner_balance.py:299 | 2326 | #: code:addons/account/report/account_partner_balance.py:299 |
| 3596 | 2327 | #: code:addons/account/report/account_partner_ledger.py:274 | ||
| 3597 | 2256 | #, python-format | 2328 | #, python-format |
| 3598 | 2257 | msgid "Payable Accounts" | 2329 | msgid "Payable Accounts" |
| 3599 | 2258 | msgstr "Comptes a pagar" | 2330 | msgstr "Comptes a pagar" |
| 3600 | @@ -2563,7 +2635,11 @@ | |||
| 3601 | 2563 | msgstr "Crea un compte basat en aquesta plantilla" | 2635 | msgstr "Crea un compte basat en aquesta plantilla" |
| 3602 | 2564 | 2636 | ||
| 3603 | 2565 | #. module: account | 2637 | #. module: account |
| 3604 | 2638 | <<<<<<< TREE | ||
| 3605 | 2566 | #: code:addons/account/account_invoice.py:901 | 2639 | #: code:addons/account/account_invoice.py:901 |
| 3606 | 2640 | ======= | ||
| 3607 | 2641 | #: code:addons/account/account_invoice.py:933 | ||
| 3608 | 2642 | >>>>>>> MERGE-SOURCE | ||
| 3609 | 2567 | #, python-format | 2643 | #, python-format |
| 3610 | 2568 | msgid "" | 2644 | msgid "" |
| 3611 | 2569 | "Cannot create the invoice.\n" | 2645 | "Cannot create the invoice.\n" |
| 3612 | @@ -2834,6 +2910,7 @@ | |||
| 3613 | 2834 | msgstr "Comptes" | 2910 | msgstr "Comptes" |
| 3614 | 2835 | 2911 | ||
| 3615 | 2836 | #. module: account | 2912 | #. module: account |
| 3616 | 2913 | <<<<<<< TREE | ||
| 3617 | 2837 | #: code:addons/account/account.py:3503 | 2914 | #: code:addons/account/account.py:3503 |
| 3618 | 2838 | #: code:addons/account/account_bank_statement.py:404 | 2915 | #: code:addons/account/account_bank_statement.py:404 |
| 3619 | 2839 | #: code:addons/account/account_invoice.py:378 | 2916 | #: code:addons/account/account_invoice.py:378 |
| 3620 | @@ -2843,6 +2920,16 @@ | |||
| 3621 | 2843 | #: code:addons/account/account_invoice.py:605 | 2920 | #: code:addons/account/account_invoice.py:605 |
| 3622 | 2844 | #: code:addons/account/account_invoice.py:627 | 2921 | #: code:addons/account/account_invoice.py:627 |
| 3623 | 2845 | #: code:addons/account/account_move_line.py:535 | 2922 | #: code:addons/account/account_move_line.py:535 |
| 3624 | 2923 | ======= | ||
| 3625 | 2924 | #: code:addons/account/account.py:3541 | ||
| 3626 | 2925 | #: code:addons/account/account_bank_statement.py:405 | ||
| 3627 | 2926 | #: code:addons/account/account_invoice.py:507 | ||
| 3628 | 2927 | #: code:addons/account/account_invoice.py:609 | ||
| 3629 | 2928 | #: code:addons/account/account_invoice.py:624 | ||
| 3630 | 2929 | #: code:addons/account/account_invoice.py:632 | ||
| 3631 | 2930 | #: code:addons/account/account_invoice.py:657 | ||
| 3632 | 2931 | #: code:addons/account/account_move_line.py:536 | ||
| 3633 | 2932 | >>>>>>> MERGE-SOURCE | ||
| 3634 | 2846 | #, python-format | 2933 | #, python-format |
| 3635 | 2847 | msgid "Configuration Error!" | 2934 | msgid "Configuration Error!" |
| 3636 | 2848 | msgstr "Error de configuració!" | 2935 | msgstr "Error de configuració!" |
| 3637 | @@ -3072,8 +3159,13 @@ | |||
| 3638 | 3072 | msgstr "" | 3159 | msgstr "" |
| 3639 | 3073 | 3160 | ||
| 3640 | 3074 | #. module: account | 3161 | #. module: account |
| 3641 | 3162 | <<<<<<< TREE | ||
| 3642 | 3075 | #: code:addons/account/account.py:2308 | 3163 | #: code:addons/account/account.py:2308 |
| 3643 | 3076 | #: code:addons/account/account_invoice.py:744 | 3164 | #: code:addons/account/account_invoice.py:744 |
| 3644 | 3165 | ======= | ||
| 3645 | 3166 | #: code:addons/account/account.py:2346 | ||
| 3646 | 3167 | #: code:addons/account/account_invoice.py:775 | ||
| 3647 | 3168 | >>>>>>> MERGE-SOURCE | ||
| 3648 | 3077 | #: code:addons/account/account_move_line.py:195 | 3169 | #: code:addons/account/account_move_line.py:195 |
| 3649 | 3078 | #, python-format | 3170 | #, python-format |
| 3650 | 3079 | msgid "You have to define an analytic journal on the '%s' journal!" | 3171 | msgid "You have to define an analytic journal on the '%s' journal!" |
| 3651 | @@ -3134,6 +3226,11 @@ | |||
| 3652 | 3134 | msgstr "" | 3226 | msgstr "" |
| 3653 | 3135 | 3227 | ||
| 3654 | 3136 | #. module: account | 3228 | #. module: account |
| 3655 | 3229 | #: report:account.journal.period.print:0 | ||
| 3656 | 3230 | msgid "Reference Number" | ||
| 3657 | 3231 | msgstr "Número de referència" | ||
| 3658 | 3232 | |||
| 3659 | 3233 | #. module: account | ||
| 3660 | 3137 | #: selection:account.entries.report,month:0 | 3234 | #: selection:account.entries.report,month:0 |
| 3661 | 3138 | #: selection:account.invoice.report,month:0 | 3235 | #: selection:account.invoice.report,month:0 |
| 3662 | 3139 | #: selection:analytic.entries.report,month:0 | 3236 | #: selection:analytic.entries.report,month:0 |
| 3663 | @@ -3241,7 +3338,11 @@ | |||
| 3664 | 3241 | msgstr "Posició fiscal" | 3338 | msgstr "Posició fiscal" |
| 3665 | 3242 | 3339 | ||
| 3666 | 3243 | #. module: account | 3340 | #. module: account |
| 3667 | 3341 | <<<<<<< TREE | ||
| 3668 | 3244 | #: code:addons/account/account_invoice.py:791 | 3342 | #: code:addons/account/account_invoice.py:791 |
| 3669 | 3343 | ======= | ||
| 3670 | 3344 | #: code:addons/account/account_invoice.py:823 | ||
| 3671 | 3345 | >>>>>>> MERGE-SOURCE | ||
| 3672 | 3245 | #, python-format | 3346 | #, python-format |
| 3673 | 3246 | msgid "" | 3347 | msgid "" |
| 3674 | 3247 | "Tax base different!\n" | 3348 | "Tax base different!\n" |
| 3675 | @@ -3402,8 +3503,13 @@ | |||
| 3676 | 3402 | msgstr "Vista" | 3503 | msgstr "Vista" |
| 3677 | 3403 | 3504 | ||
| 3678 | 3404 | #. module: account | 3505 | #. module: account |
| 3679 | 3506 | <<<<<<< TREE | ||
| 3680 | 3405 | #: code:addons/account/account.py:3422 | 3507 | #: code:addons/account/account.py:3422 |
| 3681 | 3406 | #: code:addons/account/account_bank.py:95 | 3508 | #: code:addons/account/account_bank.py:95 |
| 3682 | 3509 | ======= | ||
| 3683 | 3510 | #: code:addons/account/account.py:3460 | ||
| 3684 | 3511 | #: code:addons/account/account_bank.py:94 | ||
| 3685 | 3512 | >>>>>>> MERGE-SOURCE | ||
| 3686 | 3407 | #, python-format | 3513 | #, python-format |
| 3687 | 3408 | msgid "BNK" | 3514 | msgid "BNK" |
| 3688 | 3409 | msgstr "BANC" | 3515 | msgstr "BANC" |
| 3689 | @@ -3675,7 +3781,11 @@ | |||
| 3690 | 3675 | "les mateixes referències que el propi extracte" | 3781 | "les mateixes referències que el propi extracte" |
| 3691 | 3676 | 3782 | ||
| 3692 | 3677 | #. module: account | 3783 | #. module: account |
| 3693 | 3784 | <<<<<<< TREE | ||
| 3694 | 3678 | #: code:addons/account/account_invoice.py:984 | 3785 | #: code:addons/account/account_invoice.py:984 |
| 3695 | 3786 | ======= | ||
| 3696 | 3787 | #: code:addons/account/account_invoice.py:1016 | ||
| 3697 | 3788 | >>>>>>> MERGE-SOURCE | ||
| 3698 | 3679 | #, python-format | 3789 | #, python-format |
| 3699 | 3680 | msgid "" | 3790 | msgid "" |
| 3700 | 3681 | "You cannot create an invoice on a centralized journal. Uncheck the " | 3791 | "You cannot create an invoice on a centralized journal. Uncheck the " |
| 3701 | @@ -3690,7 +3800,11 @@ | |||
| 3702 | 3690 | msgstr "Saldo inicial" | 3800 | msgstr "Saldo inicial" |
| 3703 | 3691 | 3801 | ||
| 3704 | 3692 | #. module: account | 3802 | #. module: account |
| 3705 | 3803 | <<<<<<< TREE | ||
| 3706 | 3693 | #: code:addons/account/account_invoice.py:1434 | 3804 | #: code:addons/account/account_invoice.py:1434 |
| 3707 | 3805 | ======= | ||
| 3708 | 3806 | #: code:addons/account/account_invoice.py:1465 | ||
| 3709 | 3807 | >>>>>>> MERGE-SOURCE | ||
| 3710 | 3694 | #, python-format | 3808 | #, python-format |
| 3711 | 3695 | msgid "No Partner Defined !" | 3809 | msgid "No Partner Defined !" |
| 3712 | 3696 | msgstr "No s'ha definit empresa!" | 3810 | msgstr "No s'ha definit empresa!" |
| 3713 | @@ -3958,14 +4072,21 @@ | |||
| 3714 | 3958 | msgstr "" | 4072 | msgstr "" |
| 3715 | 3959 | 4073 | ||
| 3716 | 3960 | #. module: account | 4074 | #. module: account |
| 3717 | 4075 | <<<<<<< TREE | ||
| 3718 | 3961 | #: report:account.invoice:0 | 4076 | #: report:account.invoice:0 |
| 3719 | 3962 | msgid "VAT :" | 4077 | msgid "VAT :" |
| 3720 | 3963 | msgstr "CIF/NIF:" | 4078 | msgstr "CIF/NIF:" |
| 3721 | 3964 | 4079 | ||
| 3722 | 3965 | #. module: account | 4080 | #. module: account |
| 3723 | 4081 | ======= | ||
| 3724 | 4082 | #: report:account.account.balance:0 | ||
| 3725 | 4083 | >>>>>>> MERGE-SOURCE | ||
| 3726 | 3966 | #: report:account.central.journal:0 | 4084 | #: report:account.central.journal:0 |
| 3727 | 3967 | #: view:account.config.settings:0 | 4085 | #: view:account.config.settings:0 |
| 3728 | 4086 | #: report:account.general.journal:0 | ||
| 3729 | 3968 | #: report:account.general.ledger:0 | 4087 | #: report:account.general.ledger:0 |
| 3730 | 4088 | #: report:account.general.ledger_landscape:0 | ||
| 3731 | 4089 | #: report:account.journal.period.print:0 | ||
| 3732 | 3969 | #: report:account.partner.balance:0 | 4090 | #: report:account.partner.balance:0 |
| 3733 | 3970 | #: report:account.third_party_ledger:0 | 4091 | #: report:account.third_party_ledger:0 |
| 3734 | 3971 | #: report:account.third_party_ledger_other:0 | 4092 | #: report:account.third_party_ledger_other:0 |
| 3735 | @@ -4332,7 +4453,11 @@ | |||
| 3736 | 4332 | msgstr "Fills consolidats" | 4453 | msgstr "Fills consolidats" |
| 3737 | 4333 | 4454 | ||
| 3738 | 4334 | #. module: account | 4455 | #. module: account |
| 3739 | 4456 | <<<<<<< TREE | ||
| 3740 | 4335 | #: code:addons/account/account_invoice.py:550 | 4457 | #: code:addons/account/account_invoice.py:550 |
| 3741 | 4458 | ======= | ||
| 3742 | 4459 | #: code:addons/account/account_invoice.py:573 | ||
| 3743 | 4460 | >>>>>>> MERGE-SOURCE | ||
| 3744 | 4336 | #: code:addons/account/wizard/account_invoice_refund.py:146 | 4461 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
| 3745 | 4337 | #, python-format | 4462 | #, python-format |
| 3746 | 4338 | msgid "Insufficient Data!" | 4463 | msgid "Insufficient Data!" |
| 3747 | @@ -4607,8 +4732,13 @@ | |||
| 3748 | 4607 | msgstr "" | 4732 | msgstr "" |
| 3749 | 4608 | 4733 | ||
| 3750 | 4609 | #. module: account | 4734 | #. module: account |
| 3751 | 4735 | <<<<<<< TREE | ||
| 3752 | 4610 | #: code:addons/account/account_invoice.py:583 | 4736 | #: code:addons/account/account_invoice.py:583 |
| 3753 | 4611 | #: code:addons/account/account_invoice.py:598 | 4737 | #: code:addons/account/account_invoice.py:598 |
| 3754 | 4738 | ======= | ||
| 3755 | 4739 | #: code:addons/account/account_invoice.py:610 | ||
| 3756 | 4740 | #: code:addons/account/account_invoice.py:625 | ||
| 3757 | 4741 | >>>>>>> MERGE-SOURCE | ||
| 3758 | 4612 | #, python-format | 4742 | #, python-format |
| 3759 | 4613 | msgid "" | 4743 | msgid "" |
| 3760 | 4614 | "Cannot find a chart of account, you should create one from Settings\\" | 4744 | "Cannot find a chart of account, you should create one from Settings\\" |
| 3761 | @@ -4881,7 +5011,11 @@ | |||
| 3762 | 4881 | msgstr "" | 5011 | msgstr "" |
| 3763 | 4882 | 5012 | ||
| 3764 | 4883 | #. module: account | 5013 | #. module: account |
| 3765 | 5014 | <<<<<<< TREE | ||
| 3766 | 4884 | #: code:addons/account/account_invoice.py:627 | 5015 | #: code:addons/account/account_invoice.py:627 |
| 3767 | 5016 | ======= | ||
| 3768 | 5017 | #: code:addons/account/account_invoice.py:658 | ||
| 3769 | 5018 | >>>>>>> MERGE-SOURCE | ||
| 3770 | 4885 | #, python-format | 5019 | #, python-format |
| 3771 | 4886 | msgid "" | 5020 | msgid "" |
| 3772 | 4887 | "Cannot find any account journal of %s type for this company.\n" | 5021 | "Cannot find any account journal of %s type for this company.\n" |
| 3773 | @@ -5205,7 +5339,11 @@ | |||
| 3774 | 5205 | msgstr "Aplicació impost" | 5339 | msgstr "Aplicació impost" |
| 3775 | 5206 | 5340 | ||
| 3776 | 5207 | #. module: account | 5341 | #. module: account |
| 3777 | 5342 | <<<<<<< TREE | ||
| 3778 | 5208 | #: code:addons/account/account_invoice.py:890 | 5343 | #: code:addons/account/account_invoice.py:890 |
| 3779 | 5344 | ======= | ||
| 3780 | 5345 | #: code:addons/account/account_invoice.py:922 | ||
| 3781 | 5346 | >>>>>>> MERGE-SOURCE | ||
| 3782 | 5209 | #, python-format | 5347 | #, python-format |
| 3783 | 5210 | msgid "" | 5348 | msgid "" |
| 3784 | 5211 | "Please verify the price of the invoice !\n" | 5349 | "Please verify the price of the invoice !\n" |
| 3785 | @@ -5532,7 +5670,11 @@ | |||
| 3786 | 5532 | msgstr "Codi per calcular (si tipus=codi)" | 5670 | msgstr "Codi per calcular (si tipus=codi)" |
| 3787 | 5533 | 5671 | ||
| 3788 | 5534 | #. module: account | 5672 | #. module: account |
| 3789 | 5673 | <<<<<<< TREE | ||
| 3790 | 5535 | #: code:addons/account/account_invoice.py:485 | 5674 | #: code:addons/account/account_invoice.py:485 |
| 3791 | 5675 | ======= | ||
| 3792 | 5676 | #: code:addons/account/account_invoice.py:508 | ||
| 3793 | 5677 | >>>>>>> MERGE-SOURCE | ||
| 3794 | 5536 | #, python-format | 5678 | #, python-format |
| 3795 | 5537 | msgid "" | 5679 | msgid "" |
| 3796 | 5538 | "Cannot find a chart of accounts for this company, you should create one." | 5680 | "Cannot find a chart of accounts for this company, you should create one." |
| 3797 | @@ -5924,6 +6066,18 @@ | |||
| 3798 | 5924 | msgstr "" | 6066 | msgstr "" |
| 3799 | 5925 | 6067 | ||
| 3800 | 5926 | #. module: account | 6068 | #. module: account |
| 3801 | 6069 | <<<<<<< TREE | ||
| 3802 | 6070 | ======= | ||
| 3803 | 6071 | #: code:addons/account/account_invoice.py:474 | ||
| 3804 | 6072 | #, python-format | ||
| 3805 | 6073 | msgid "" | ||
| 3806 | 6074 | "You cannot delete an invoice after it has been validated (and received a " | ||
| 3807 | 6075 | "number). You can set it back to \"Draft\" state and modify its content, " | ||
| 3808 | 6076 | "then re-confirm it." | ||
| 3809 | 6077 | msgstr "" | ||
| 3810 | 6078 | |||
| 3811 | 6079 | #. module: account | ||
| 3812 | 6080 | >>>>>>> MERGE-SOURCE | ||
| 3813 | 5927 | #: help:account.automatic.reconcile,power:0 | 6081 | #: help:account.automatic.reconcile,power:0 |
| 3814 | 5928 | msgid "" | 6082 | msgid "" |
| 3815 | 5929 | "Number of partial amounts that can be combined to find a balance point can " | 6083 | "Number of partial amounts that can be combined to find a balance point can " |
| 3816 | @@ -6077,7 +6231,11 @@ | |||
| 3817 | 6077 | #: view:account.config.settings:0 | 6231 | #: view:account.config.settings:0 |
| 3818 | 6078 | #: view:account.invoice:0 | 6232 | #: view:account.invoice:0 |
| 3819 | 6079 | #: view:account.invoice.report:0 | 6233 | #: view:account.invoice.report:0 |
| 3820 | 6234 | <<<<<<< TREE | ||
| 3821 | 6080 | #: code:addons/account/account_invoice.py:355 | 6235 | #: code:addons/account/account_invoice.py:355 |
| 3822 | 6236 | ======= | ||
| 3823 | 6237 | #: code:addons/account/account_invoice.py:390 | ||
| 3824 | 6238 | >>>>>>> MERGE-SOURCE | ||
| 3825 | 6081 | #, python-format | 6239 | #, python-format |
| 3826 | 6082 | msgid "Supplier" | 6240 | msgid "Supplier" |
| 3827 | 6083 | msgstr "Proveïdor" | 6241 | msgstr "Proveïdor" |
| 3828 | @@ -6097,7 +6255,7 @@ | |||
| 3829 | 6097 | msgstr "Compte n°" | 6255 | msgstr "Compte n°" |
| 3830 | 6098 | 6256 | ||
| 3831 | 6099 | #. module: account | 6257 | #. module: account |
| 3833 | 6100 | #: code:addons/account/account_invoice.py:92 | 6258 | #: code:addons/account/account_invoice.py:95 |
| 3834 | 6101 | #, python-format | 6259 | #, python-format |
| 3835 | 6102 | msgid "Free Reference" | 6260 | msgid "Free Reference" |
| 3836 | 6103 | msgstr "Referència lliure" | 6261 | msgstr "Referència lliure" |
| 3837 | @@ -6107,7 +6265,9 @@ | |||
| 3838 | 6107 | #: selection:account.common.partner.report,result_selection:0 | 6265 | #: selection:account.common.partner.report,result_selection:0 |
| 3839 | 6108 | #: selection:account.partner.balance,result_selection:0 | 6266 | #: selection:account.partner.balance,result_selection:0 |
| 3840 | 6109 | #: selection:account.partner.ledger,result_selection:0 | 6267 | #: selection:account.partner.ledger,result_selection:0 |
| 3841 | 6268 | #: report:account.third_party_ledger:0 | ||
| 3842 | 6110 | #: code:addons/account/report/account_partner_balance.py:301 | 6269 | #: code:addons/account/report/account_partner_balance.py:301 |
| 3843 | 6270 | #: code:addons/account/report/account_partner_ledger.py:276 | ||
| 3844 | 6111 | #, python-format | 6271 | #, python-format |
| 3845 | 6112 | msgid "Receivable and Payable Accounts" | 6272 | msgid "Receivable and Payable Accounts" |
| 3846 | 6113 | msgstr "Comptes a cobrar i pagar" | 6273 | msgstr "Comptes a cobrar i pagar" |
| 3847 | @@ -6412,7 +6572,11 @@ | |||
| 3848 | 6412 | msgstr "" | 6572 | msgstr "" |
| 3849 | 6413 | 6573 | ||
| 3850 | 6414 | #. module: account | 6574 | #. module: account |
| 3851 | 6575 | <<<<<<< TREE | ||
| 3852 | 6415 | #: code:addons/account/account_invoice.py:1091 | 6576 | #: code:addons/account/account_invoice.py:1091 |
| 3853 | 6577 | ======= | ||
| 3854 | 6578 | #: code:addons/account/account_invoice.py:1124 | ||
| 3855 | 6579 | >>>>>>> MERGE-SOURCE | ||
| 3856 | 6416 | #, python-format | 6580 | #, python-format |
| 3857 | 6417 | msgid "" | 6581 | msgid "" |
| 3858 | 6418 | "You cannot cancel an invoice which is partially paid. You need to " | 6582 | "You cannot cancel an invoice which is partially paid. You need to " |
| 3859 | @@ -6584,7 +6748,11 @@ | |||
| 3860 | 6584 | msgstr "" | 6748 | msgstr "" |
| 3861 | 6585 | 6749 | ||
| 3862 | 6586 | #. module: account | 6750 | #. module: account |
| 3863 | 6751 | <<<<<<< TREE | ||
| 3864 | 6587 | #: code:addons/account/account_invoice.py:606 | 6752 | #: code:addons/account/account_invoice.py:606 |
| 3865 | 6753 | ======= | ||
| 3866 | 6754 | #: code:addons/account/account_invoice.py:633 | ||
| 3867 | 6755 | >>>>>>> MERGE-SOURCE | ||
| 3868 | 6588 | #, python-format | 6756 | #, python-format |
| 3869 | 6589 | msgid "Invoice line account's company and invoice's compnay does not match." | 6757 | msgid "Invoice line account's company and invoice's compnay does not match." |
| 3870 | 6590 | msgstr "" | 6758 | msgstr "" |
| 3871 | @@ -6734,12 +6902,21 @@ | |||
| 3872 | 6734 | "impostos fills. En aquest cas, l'ordre d'avaluació és important." | 6902 | "impostos fills. En aquest cas, l'ordre d'avaluació és important." |
| 3873 | 6735 | 6903 | ||
| 3874 | 6736 | #. module: account | 6904 | #. module: account |
| 3875 | 6905 | <<<<<<< TREE | ||
| 3876 | 6737 | #: code:addons/account/account.py:1410 | 6906 | #: code:addons/account/account.py:1410 |
| 3877 | 6738 | #: code:addons/account/account.py:1415 | 6907 | #: code:addons/account/account.py:1415 |
| 3878 | 6739 | #: code:addons/account/account.py:1444 | 6908 | #: code:addons/account/account.py:1444 |
| 3879 | 6740 | #: code:addons/account/account.py:1451 | 6909 | #: code:addons/account/account.py:1451 |
| 3880 | 6741 | #: code:addons/account/account_invoice.py:983 | 6910 | #: code:addons/account/account_invoice.py:983 |
| 3881 | 6742 | #: code:addons/account/account_move_line.py:1008 | 6911 | #: code:addons/account/account_move_line.py:1008 |
| 3882 | 6912 | ======= | ||
| 3883 | 6913 | #: code:addons/account/account.py:1448 | ||
| 3884 | 6914 | #: code:addons/account/account.py:1453 | ||
| 3885 | 6915 | #: code:addons/account/account.py:1482 | ||
| 3886 | 6916 | #: code:addons/account/account.py:1489 | ||
| 3887 | 6917 | #: code:addons/account/account_invoice.py:1015 | ||
| 3888 | 6918 | #: code:addons/account/account_move_line.py:1005 | ||
| 3889 | 6919 | >>>>>>> MERGE-SOURCE | ||
| 3890 | 6743 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 | 6920 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
| 3891 | 6744 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 | 6921 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
| 3892 | 6745 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 | 6922 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
| 3893 | @@ -6825,6 +7002,10 @@ | |||
| 3894 | 6825 | #: report:account.invoice:0 | 7002 | #: report:account.invoice:0 |
| 3895 | 6826 | #: selection:account.invoice,type:0 | 7003 | #: selection:account.invoice,type:0 |
| 3896 | 6827 | #: selection:account.invoice.report,type:0 | 7004 | #: selection:account.invoice.report,type:0 |
| 3897 | 7005 | <<<<<<< TREE | ||
| 3898 | 7006 | ======= | ||
| 3899 | 7007 | #: code:addons/account/account_invoice.py:1160 | ||
| 3900 | 7008 | >>>>>>> MERGE-SOURCE | ||
| 3901 | 6828 | #: selection:report.invoice.created,type:0 | 7009 | #: selection:report.invoice.created,type:0 |
| 3902 | 6829 | msgid "Supplier Refund" | 7010 | msgid "Supplier Refund" |
| 3903 | 6830 | msgstr "Factura rectificativa (abonament) de proveïdor" | 7011 | msgstr "Factura rectificativa (abonament) de proveïdor" |
| 3904 | @@ -7982,7 +8163,11 @@ | |||
| 3905 | 7982 | msgstr "Maig" | 8163 | msgstr "Maig" |
| 3906 | 7983 | 8164 | ||
| 3907 | 7984 | #. module: account | 8165 | #. module: account |
| 3908 | 8166 | <<<<<<< TREE | ||
| 3909 | 7985 | #: code:addons/account/account_invoice.py:788 | 8167 | #: code:addons/account/account_invoice.py:788 |
| 3910 | 8168 | ======= | ||
| 3911 | 8169 | #: code:addons/account/account_invoice.py:820 | ||
| 3912 | 8170 | >>>>>>> MERGE-SOURCE | ||
| 3913 | 7986 | #, python-format | 8171 | #, python-format |
| 3914 | 7987 | msgid "Global taxes defined, but they are not in invoice lines !" | 8172 | msgid "Global taxes defined, but they are not in invoice lines !" |
| 3915 | 7988 | msgstr "" | 8173 | msgstr "" |
| 3916 | @@ -8023,7 +8208,11 @@ | |||
| 3917 | 8023 | #: view:account.config.settings:0 | 8208 | #: view:account.config.settings:0 |
| 3918 | 8024 | #: view:account.invoice:0 | 8209 | #: view:account.invoice:0 |
| 3919 | 8025 | #: view:account.invoice.report:0 | 8210 | #: view:account.invoice.report:0 |
| 3920 | 8211 | <<<<<<< TREE | ||
| 3921 | 8026 | #: code:addons/account/account_invoice.py:353 | 8212 | #: code:addons/account/account_invoice.py:353 |
| 3922 | 8213 | ======= | ||
| 3923 | 8214 | #: code:addons/account/account_invoice.py:388 | ||
| 3924 | 8215 | >>>>>>> MERGE-SOURCE | ||
| 3925 | 8027 | #, python-format | 8216 | #, python-format |
| 3926 | 8028 | msgid "Customer" | 8217 | msgid "Customer" |
| 3927 | 8029 | msgstr "Client" | 8218 | msgstr "Client" |
| 3928 | @@ -8160,6 +8349,17 @@ | |||
| 3929 | 8160 | msgstr "Conciliació de transaccions" | 8349 | msgstr "Conciliació de transaccions" |
| 3930 | 8161 | 8350 | ||
| 3931 | 8162 | #. module: account | 8351 | #. module: account |
| 3932 | 8352 | <<<<<<< TREE | ||
| 3933 | 8353 | ======= | ||
| 3934 | 8354 | #: code:addons/account/account_invoice.py:472 | ||
| 3935 | 8355 | #, python-format | ||
| 3936 | 8356 | msgid "" | ||
| 3937 | 8357 | "You cannot delete an invoice which is not draft or cancelled. You should " | ||
| 3938 | 8358 | "refund it instead." | ||
| 3939 | 8359 | msgstr "" | ||
| 3940 | 8360 | |||
| 3941 | 8361 | #. module: account | ||
| 3942 | 8362 | >>>>>>> MERGE-SOURCE | ||
| 3943 | 8163 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement | 8363 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
| 3944 | 8164 | msgid "Legal Reports" | 8364 | msgid "Legal Reports" |
| 3945 | 8165 | msgstr "Informes legals" | 8365 | msgstr "Informes legals" |
| 3946 | @@ -8276,7 +8476,11 @@ | |||
| 3947 | 8276 | msgstr "Seleccioneu una moneda per aplicar en la factura." | 8476 | msgstr "Seleccioneu una moneda per aplicar en la factura." |
| 3948 | 8277 | 8477 | ||
| 3949 | 8278 | #. module: account | 8478 | #. module: account |
| 3950 | 8479 | <<<<<<< TREE | ||
| 3951 | 8279 | #: code:addons/account/account_invoice.py:869 | 8480 | #: code:addons/account/account_invoice.py:869 |
| 3952 | 8481 | ======= | ||
| 3953 | 8482 | #: code:addons/account/account_invoice.py:901 | ||
| 3954 | 8483 | >>>>>>> MERGE-SOURCE | ||
| 3955 | 8280 | #, python-format | 8484 | #, python-format |
| 3956 | 8281 | msgid "No Invoice Lines !" | 8485 | msgid "No Invoice Lines !" |
| 3957 | 8282 | msgstr "No hi ha línies de factura!" | 8486 | msgstr "No hi ha línies de factura!" |
| 3958 | @@ -8355,7 +8559,11 @@ | |||
| 3959 | 8355 | msgstr "Empresa associada" | 8559 | msgstr "Empresa associada" |
| 3960 | 8356 | 8560 | ||
| 3961 | 8357 | #. module: account | 8561 | #. module: account |
| 3962 | 8562 | <<<<<<< TREE | ||
| 3963 | 8358 | #: code:addons/account/account_invoice.py:1434 | 8563 | #: code:addons/account/account_invoice.py:1434 |
| 3964 | 8564 | ======= | ||
| 3965 | 8565 | #: code:addons/account/account_invoice.py:1465 | ||
| 3966 | 8566 | >>>>>>> MERGE-SOURCE | ||
| 3967 | 8359 | #, python-format | 8567 | #, python-format |
| 3968 | 8360 | msgid "You must first select a partner !" | 8568 | msgid "You must first select a partner !" |
| 3969 | 8361 | msgstr "Primer heu de seleccionar una empresa!" | 8569 | msgstr "Primer heu de seleccionar una empresa!" |
| 3970 | @@ -9312,7 +9520,11 @@ | |||
| 3971 | 9312 | msgstr "Impost de la compra (%)" | 9520 | msgstr "Impost de la compra (%)" |
| 3972 | 9313 | 9521 | ||
| 3973 | 9314 | #. module: account | 9522 | #. module: account |
| 3974 | 9523 | <<<<<<< TREE | ||
| 3975 | 9315 | #: code:addons/account/account_invoice.py:869 | 9524 | #: code:addons/account/account_invoice.py:869 |
| 3976 | 9525 | ======= | ||
| 3977 | 9526 | #: code:addons/account/account_invoice.py:901 | ||
| 3978 | 9527 | >>>>>>> MERGE-SOURCE | ||
| 3979 | 9316 | #, python-format | 9528 | #, python-format |
| 3980 | 9317 | msgid "Please create some invoice lines." | 9529 | msgid "Please create some invoice lines." |
| 3981 | 9318 | msgstr "Creeu algunes línies de factura" | 9530 | msgstr "Creeu algunes línies de factura" |
| 3982 | @@ -9873,7 +10085,11 @@ | |||
| 3983 | 9873 | msgstr "No conciliat" | 10085 | msgstr "No conciliat" |
| 3984 | 9874 | 10086 | ||
| 3985 | 9875 | #. module: account | 10087 | #. module: account |
| 3986 | 10088 | <<<<<<< TREE | ||
| 3987 | 9876 | #: code:addons/account/account_invoice.py:890 | 10089 | #: code:addons/account/account_invoice.py:890 |
| 3988 | 10090 | ======= | ||
| 3989 | 10091 | #: code:addons/account/account_invoice.py:922 | ||
| 3990 | 10092 | >>>>>>> MERGE-SOURCE | ||
| 3991 | 9877 | #, python-format | 10093 | #, python-format |
| 3992 | 9878 | msgid "Bad total !" | 10094 | msgid "Bad total !" |
| 3993 | 9879 | msgstr "Total erroni!" | 10095 | msgstr "Total erroni!" |
| 3994 | @@ -10358,6 +10574,7 @@ | |||
| 3995 | 10358 | 10574 | ||
| 3996 | 10359 | #. module: account | 10575 | #. module: account |
| 3997 | 10360 | #: field:account.account,company_id:0 | 10576 | #: field:account.account,company_id:0 |
| 3998 | 10577 | #: report:account.account.balance:0 | ||
| 3999 | 10361 | #: field:account.aged.trial.balance,company_id:0 | 10578 | #: field:account.aged.trial.balance,company_id:0 |
| 4000 | 10362 | #: field:account.analytic.journal,company_id:0 | 10579 | #: field:account.analytic.journal,company_id:0 |
| 4001 | 10363 | #: field:account.balance.report,company_id:0 | 10580 | #: field:account.balance.report,company_id:0 |
| 4002 | @@ -10373,7 +10590,9 @@ | |||
| 4003 | 10373 | #: field:account.entries.report,company_id:0 | 10590 | #: field:account.entries.report,company_id:0 |
| 4004 | 10374 | #: field:account.fiscal.position,company_id:0 | 10591 | #: field:account.fiscal.position,company_id:0 |
| 4005 | 10375 | #: field:account.fiscalyear,company_id:0 | 10592 | #: field:account.fiscalyear,company_id:0 |
| 4006 | 10593 | #: report:account.general.journal:0 | ||
| 4007 | 10376 | #: field:account.general.journal,company_id:0 | 10594 | #: field:account.general.journal,company_id:0 |
| 4008 | 10595 | #: report:account.general.ledger_landscape:0 | ||
| 4009 | 10377 | #: field:account.installer,company_id:0 | 10596 | #: field:account.installer,company_id:0 |
| 4010 | 10378 | #: field:account.invoice,company_id:0 | 10597 | #: field:account.invoice,company_id:0 |
| 4011 | 10379 | #: field:account.invoice.line,company_id:0 | 10598 | #: field:account.invoice.line,company_id:0 |
| 4012 | @@ -10382,6 +10601,7 @@ | |||
| 4013 | 10382 | #: field:account.invoice.tax,company_id:0 | 10601 | #: field:account.invoice.tax,company_id:0 |
| 4014 | 10383 | #: field:account.journal,company_id:0 | 10602 | #: field:account.journal,company_id:0 |
| 4015 | 10384 | #: field:account.journal.period,company_id:0 | 10603 | #: field:account.journal.period,company_id:0 |
| 4016 | 10604 | #: report:account.journal.period.print:0 | ||
| 4017 | 10385 | #: field:account.model,company_id:0 | 10605 | #: field:account.model,company_id:0 |
| 4018 | 10386 | #: field:account.move,company_id:0 | 10606 | #: field:account.move,company_id:0 |
| 4019 | 10387 | #: field:account.move.line,company_id:0 | 10607 | #: field:account.move.line,company_id:0 |
| 4020 | @@ -10547,6 +10767,10 @@ | |||
| 4021 | 10547 | #: view:account.invoice:0 | 10767 | #: view:account.invoice:0 |
| 4022 | 10548 | #: selection:account.invoice,type:0 | 10768 | #: selection:account.invoice,type:0 |
| 4023 | 10549 | #: selection:account.invoice.report,type:0 | 10769 | #: selection:account.invoice.report,type:0 |
| 4024 | 10770 | <<<<<<< TREE | ||
| 4025 | 10771 | ======= | ||
| 4026 | 10772 | #: code:addons/account/account_invoice.py:1158 | ||
| 4027 | 10773 | >>>>>>> MERGE-SOURCE | ||
| 4028 | 10550 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 | 10774 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
| 4029 | 10551 | #: selection:report.invoice.created,type:0 | 10775 | #: selection:report.invoice.created,type:0 |
| 4030 | 10552 | msgid "Supplier Invoice" | 10776 | msgid "Supplier Invoice" |
| 4031 | @@ -10634,8 +10858,10 @@ | |||
| 4032 | 10634 | msgstr "" | 10858 | msgstr "" |
| 4033 | 10635 | 10859 | ||
| 4034 | 10636 | #. module: account | 10860 | #. module: account |
| 4035 | 10861 | #: report:account.account.balance:0 | ||
| 4036 | 10637 | #: selection:account.balance.report,display_account:0 | 10862 | #: selection:account.balance.report,display_account:0 |
| 4037 | 10638 | #: selection:account.common.account.report,display_account:0 | 10863 | #: selection:account.common.account.report,display_account:0 |
| 4038 | 10864 | #: report:account.general.ledger_landscape:0 | ||
| 4039 | 10639 | #: selection:account.report.general.ledger,display_account:0 | 10865 | #: selection:account.report.general.ledger,display_account:0 |
| 4040 | 10640 | msgid "With movements" | 10866 | msgid "With movements" |
| 4041 | 10641 | msgstr "Amb moviments" | 10867 | msgstr "Amb moviments" |
| 4042 | @@ -10732,7 +10958,11 @@ | |||
| 4043 | 10732 | msgstr "" | 10958 | msgstr "" |
| 4044 | 10733 | 10959 | ||
| 4045 | 10734 | #. module: account | 10960 | #. module: account |
| 4046 | 10961 | <<<<<<< TREE | ||
| 4047 | 10735 | #: code:addons/account/account_invoice.py:1515 | 10962 | #: code:addons/account/account_invoice.py:1515 |
| 4048 | 10963 | ======= | ||
| 4049 | 10964 | #: code:addons/account/account_invoice.py:1546 | ||
| 4050 | 10965 | >>>>>>> MERGE-SOURCE | ||
| 4051 | 10736 | #, python-format | 10966 | #, python-format |
| 4052 | 10737 | msgid "" | 10967 | msgid "" |
| 4053 | 10738 | "The selected unit of measure is not compatible with the unit of measure of " | 10968 | "The selected unit of measure is not compatible with the unit of measure of " |
| 4054 | @@ -10814,6 +11044,11 @@ | |||
| 4055 | 10814 | #: report:account.invoice:0 | 11044 | #: report:account.invoice:0 |
| 4056 | 10815 | #: view:account.invoice:0 | 11045 | #: view:account.invoice:0 |
| 4057 | 10816 | #: view:account.invoice.report:0 | 11046 | #: view:account.invoice.report:0 |
| 4058 | 11047 | <<<<<<< TREE | ||
| 4059 | 11048 | ======= | ||
| 4060 | 11049 | #: code:addons/account/account_invoice.py:1159 | ||
| 4061 | 11050 | #, python-format | ||
| 4062 | 11051 | >>>>>>> MERGE-SOURCE | ||
| 4063 | 10817 | msgid "Refund" | 11052 | msgid "Refund" |
| 4064 | 10818 | msgstr "Factura rectificativa (abonament)" | 11053 | msgstr "Factura rectificativa (abonament)" |
| 4065 | 10819 | 11054 | ||
| 4066 | @@ -10884,7 +11119,11 @@ | |||
| 4067 | 10884 | msgstr "Impostos factura manual" | 11119 | msgstr "Impostos factura manual" |
| 4068 | 10885 | 11120 | ||
| 4069 | 10886 | #. module: account | 11121 | #. module: account |
| 4070 | 11122 | <<<<<<< TREE | ||
| 4071 | 10887 | #: code:addons/account/account_invoice.py:550 | 11123 | #: code:addons/account/account_invoice.py:550 |
| 4072 | 11124 | ======= | ||
| 4073 | 11125 | #: code:addons/account/account_invoice.py:573 | ||
| 4074 | 11126 | >>>>>>> MERGE-SOURCE | ||
| 4075 | 10888 | #, python-format | 11127 | #, python-format |
| 4076 | 10889 | msgid "The payment term of supplier does not have a payment term line." | 11128 | msgid "The payment term of supplier does not have a payment term line." |
| 4077 | 10890 | msgstr "" | 11129 | msgstr "" |
| 4078 | 10891 | 11130 | ||
| 4079 | === modified file 'account/i18n/cs.po' | |||
| 4080 | --- account/i18n/cs.po 2013-06-13 18:15:03 +0000 | |||
| 4081 | +++ account/i18n/cs.po 2013-06-19 09:20:00 +0000 | |||
| 4082 | @@ -5,17 +5,30 @@ | |||
| 4083 | 5 | msgid "" | 5 | msgid "" |
| 4084 | 6 | msgstr "" | 6 | msgstr "" |
| 4085 | 7 | "Project-Id-Version: openobject-addons\n" | 7 | "Project-Id-Version: openobject-addons\n" |
| 4086 | 8 | <<<<<<< TREE | ||
| 4087 | 8 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
| 4088 | 9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
| 4089 | 10 | "PO-Revision-Date: 2012-06-20 16:14+0000\n" | 11 | "PO-Revision-Date: 2012-06-20 16:14+0000\n" |
| 4090 | 11 | "Last-Translator: Jiří Hajda <robie@centrum.cz>\n" | 12 | "Last-Translator: Jiří Hajda <robie@centrum.cz>\n" |
| 4091 | 12 | "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net>\n" | 13 | "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net>\n" |
| 4092 | 14 | ======= | ||
| 4093 | 15 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 4094 | 16 | "POT-Creation-Date: 2013-06-14 22:29+0000\n" | ||
| 4095 | 17 | "PO-Revision-Date: 2012-12-21 23:00+0000\n" | ||
| 4096 | 18 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 4097 | 19 | "Language-Team: Czech <cs@li.org>\n" | ||
| 4098 | 20 | >>>>>>> MERGE-SOURCE | ||
| 4099 | 13 | "MIME-Version: 1.0\n" | 21 | "MIME-Version: 1.0\n" |
| 4100 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 22 | "Content-Type: text/plain; charset=UTF-8\n" |
| 4101 | 15 | "Content-Transfer-Encoding: 8bit\n" | 23 | "Content-Transfer-Encoding: 8bit\n" |
| 4102 | 24 | <<<<<<< TREE | ||
| 4103 | 16 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" | 25 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" |
| 4104 | 17 | "X-Generator: Launchpad (build 16532)\n" | 26 | "X-Generator: Launchpad (build 16532)\n" |
| 4105 | 18 | "X-Poedit-Language: Czech\n" | 27 | "X-Poedit-Language: Czech\n" |
| 4106 | 28 | ======= | ||
| 4107 | 29 | "X-Launchpad-Export-Date: 2013-06-15 06:14+0000\n" | ||
| 4108 | 30 | "X-Generator: Launchpad (build 16667)\n" | ||
| 4109 | 31 | >>>>>>> MERGE-SOURCE | ||
| 4110 | 19 | 32 | ||
| 4111 | 20 | #. module: account | 33 | #. module: account |
| 4112 | 21 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 | 34 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
| 4113 | @@ -130,11 +143,19 @@ | |||
| 4114 | 130 | #: code:addons/account/account.py:641 | 143 | #: code:addons/account/account.py:641 |
| 4115 | 131 | #: code:addons/account/account.py:686 | 144 | #: code:addons/account/account.py:686 |
| 4116 | 132 | #: code:addons/account/account.py:781 | 145 | #: code:addons/account/account.py:781 |
| 4117 | 146 | <<<<<<< TREE | ||
| 4118 | 133 | #: code:addons/account/account.py:1049 | 147 | #: code:addons/account/account.py:1049 |
| 4119 | 134 | #: code:addons/account/account_invoice.py:788 | 148 | #: code:addons/account/account_invoice.py:788 |
| 4120 | 135 | #: code:addons/account/account_invoice.py:791 | 149 | #: code:addons/account/account_invoice.py:791 |
| 4121 | 136 | #: code:addons/account/account_invoice.py:794 | 150 | #: code:addons/account/account_invoice.py:794 |
| 4122 | 137 | #: code:addons/account/account_invoice.py:1514 | 151 | #: code:addons/account/account_invoice.py:1514 |
| 4123 | 152 | ======= | ||
| 4124 | 153 | #: code:addons/account/account.py:1058 | ||
| 4125 | 154 | #: code:addons/account/account_invoice.py:820 | ||
| 4126 | 155 | #: code:addons/account/account_invoice.py:823 | ||
| 4127 | 156 | #: code:addons/account/account_invoice.py:826 | ||
| 4128 | 157 | #: code:addons/account/account_invoice.py:1545 | ||
| 4129 | 158 | >>>>>>> MERGE-SOURCE | ||
| 4130 | 138 | #: code:addons/account/account_move_line.py:98 | 159 | #: code:addons/account/account_move_line.py:98 |
| 4131 | 139 | #: code:addons/account/account_move_line.py:774 | 160 | #: code:addons/account/account_move_line.py:774 |
| 4132 | 140 | #: code:addons/account/account_move_line.py:827 | 161 | #: code:addons/account/account_move_line.py:827 |
| 4133 | @@ -337,7 +358,7 @@ | |||
| 4134 | 337 | msgstr "" | 358 | msgstr "" |
| 4135 | 338 | 359 | ||
| 4136 | 339 | #. module: account | 360 | #. module: account |
| 4138 | 340 | #: code:addons/account/account_invoice.py:74 | 361 | #: code:addons/account/account_invoice.py:77 |
| 4139 | 341 | #, python-format | 362 | #, python-format |
| 4140 | 342 | msgid "You must define an analytic journal of type '%s'!" | 363 | msgid "You must define an analytic journal of type '%s'!" |
| 4141 | 343 | msgstr "" | 364 | msgstr "" |
| 4142 | @@ -593,11 +614,23 @@ | |||
| 4143 | 593 | msgstr "Účetní potvrzuje výpis." | 614 | msgstr "Účetní potvrzuje výpis." |
| 4144 | 594 | 615 | ||
| 4145 | 595 | #. module: account | 616 | #. module: account |
| 4146 | 617 | <<<<<<< TREE | ||
| 4147 | 596 | #. openerp-web | 618 | #. openerp-web |
| 4148 | 597 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 | 619 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
| 4149 | 598 | #, python-format | 620 | #, python-format |
| 4150 | 599 | msgid "Nothing to reconcile" | 621 | msgid "Nothing to reconcile" |
| 4151 | 600 | msgstr "" | 622 | msgstr "" |
| 4152 | 623 | ======= | ||
| 4153 | 624 | #: report:account.account.balance:0 | ||
| 4154 | 625 | #: selection:account.balance.report,display_account:0 | ||
| 4155 | 626 | #: selection:account.common.account.report,display_account:0 | ||
| 4156 | 627 | #: report:account.general.ledger_landscape:0 | ||
| 4157 | 628 | #: selection:account.report.general.ledger,display_account:0 | ||
| 4158 | 629 | #: selection:account.tax,type_tax_use:0 | ||
| 4159 | 630 | #: selection:account.tax.template,type_tax_use:0 | ||
| 4160 | 631 | msgid "All" | ||
| 4161 | 632 | msgstr "Vše" | ||
| 4162 | 633 | >>>>>>> MERGE-SOURCE | ||
| 4163 | 601 | 634 | ||
| 4164 | 602 | #. module: account | 635 | #. module: account |
| 4165 | 603 | #: field:account.config.settings,decimal_precision:0 | 636 | #: field:account.config.settings,decimal_precision:0 |
| 4166 | @@ -728,7 +761,9 @@ | |||
| 4167 | 728 | #: selection:account.common.partner.report,result_selection:0 | 761 | #: selection:account.common.partner.report,result_selection:0 |
| 4168 | 729 | #: selection:account.partner.balance,result_selection:0 | 762 | #: selection:account.partner.balance,result_selection:0 |
| 4169 | 730 | #: selection:account.partner.ledger,result_selection:0 | 763 | #: selection:account.partner.ledger,result_selection:0 |
| 4170 | 764 | #: report:account.third_party_ledger:0 | ||
| 4171 | 731 | #: code:addons/account/report/account_partner_balance.py:297 | 765 | #: code:addons/account/report/account_partner_balance.py:297 |
| 4172 | 766 | #: code:addons/account/report/account_partner_ledger.py:272 | ||
| 4173 | 732 | #, python-format | 767 | #, python-format |
| 4174 | 733 | msgid "Receivable Accounts" | 768 | msgid "Receivable Accounts" |
| 4175 | 734 | msgstr "Pohledávky" | 769 | msgstr "Pohledávky" |
| 4176 | @@ -766,7 +801,11 @@ | |||
| 4177 | 766 | msgstr "Opravdu chcete vytvořit záznamy?" | 801 | msgstr "Opravdu chcete vytvořit záznamy?" |
| 4178 | 767 | 802 | ||
| 4179 | 768 | #. module: account | 803 | #. module: account |
| 4180 | 804 | <<<<<<< TREE | ||
| 4181 | 769 | #: code:addons/account/account_invoice.py:1330 | 805 | #: code:addons/account/account_invoice.py:1330 |
| 4182 | 806 | ======= | ||
| 4183 | 807 | #: code:addons/account/account_invoice.py:1361 | ||
| 4184 | 808 | >>>>>>> MERGE-SOURCE | ||
| 4185 | 770 | #, python-format | 809 | #, python-format |
| 4186 | 771 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." | 810 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
| 4187 | 772 | msgstr "" | 811 | msgstr "" |
| 4188 | @@ -835,7 +874,11 @@ | |||
| 4189 | 835 | msgstr "Typ" | 874 | msgstr "Typ" |
| 4190 | 836 | 875 | ||
| 4191 | 837 | #. module: account | 876 | #. module: account |
| 4192 | 877 | <<<<<<< TREE | ||
| 4193 | 838 | #: code:addons/account/account_invoice.py:794 | 878 | #: code:addons/account/account_invoice.py:794 |
| 4194 | 879 | ======= | ||
| 4195 | 880 | #: code:addons/account/account_invoice.py:826 | ||
| 4196 | 881 | >>>>>>> MERGE-SOURCE | ||
| 4197 | 839 | #, python-format | 882 | #, python-format |
| 4198 | 840 | msgid "" | 883 | msgid "" |
| 4199 | 841 | "Taxes are missing!\n" | 884 | "Taxes are missing!\n" |
| 4200 | @@ -1015,7 +1058,11 @@ | |||
| 4201 | 1015 | msgstr "Pasiva" | 1058 | msgstr "Pasiva" |
| 4202 | 1016 | 1059 | ||
| 4203 | 1017 | #. module: account | 1060 | #. module: account |
| 4204 | 1061 | <<<<<<< TREE | ||
| 4205 | 1018 | #: code:addons/account/account_invoice.py:867 | 1062 | #: code:addons/account/account_invoice.py:867 |
| 4206 | 1063 | ======= | ||
| 4207 | 1064 | #: code:addons/account/account_invoice.py:899 | ||
| 4208 | 1065 | >>>>>>> MERGE-SOURCE | ||
| 4209 | 1019 | #, python-format | 1066 | #, python-format |
| 4210 | 1020 | msgid "Please define sequence on the journal related to this invoice." | 1067 | msgid "Please define sequence on the journal related to this invoice." |
| 4211 | 1021 | msgstr "" | 1068 | msgstr "" |
| 4212 | @@ -1086,10 +1133,17 @@ | |||
| 4213 | 1086 | msgstr "" | 1133 | msgstr "" |
| 4214 | 1087 | 1134 | ||
| 4215 | 1088 | #. module: account | 1135 | #. module: account |
| 4216 | 1136 | <<<<<<< TREE | ||
| 4217 | 1089 | #: code:addons/account/account.py:2308 | 1137 | #: code:addons/account/account.py:2308 |
| 4218 | 1090 | #: code:addons/account/account_bank_statement.py:423 | 1138 | #: code:addons/account/account_bank_statement.py:423 |
| 4219 | 1091 | #: code:addons/account/account_invoice.py:74 | 1139 | #: code:addons/account/account_invoice.py:74 |
| 4220 | 1092 | #: code:addons/account/account_invoice.py:744 | 1140 | #: code:addons/account/account_invoice.py:744 |
| 4221 | 1141 | ======= | ||
| 4222 | 1142 | #: code:addons/account/account.py:2346 | ||
| 4223 | 1143 | #: code:addons/account/account_bank_statement.py:424 | ||
| 4224 | 1144 | #: code:addons/account/account_invoice.py:77 | ||
| 4225 | 1145 | #: code:addons/account/account_invoice.py:775 | ||
| 4226 | 1146 | >>>>>>> MERGE-SOURCE | ||
| 4227 | 1093 | #: code:addons/account/account_move_line.py:195 | 1147 | #: code:addons/account/account_move_line.py:195 |
| 4228 | 1094 | #, python-format | 1148 | #, python-format |
| 4229 | 1095 | msgid "No Analytic Journal !" | 1149 | msgid "No Analytic Journal !" |
| 4230 | @@ -1520,8 +1574,10 @@ | |||
| 4231 | 1520 | msgstr "" | 1574 | msgstr "" |
| 4232 | 1521 | 1575 | ||
| 4233 | 1522 | #. module: account | 1576 | #. module: account |
| 4234 | 1577 | #: report:account.account.balance:0 | ||
| 4235 | 1523 | #: selection:account.balance.report,display_account:0 | 1578 | #: selection:account.balance.report,display_account:0 |
| 4236 | 1524 | #: selection:account.common.account.report,display_account:0 | 1579 | #: selection:account.common.account.report,display_account:0 |
| 4237 | 1580 | #: report:account.general.ledger_landscape:0 | ||
| 4238 | 1525 | #: selection:account.partner.balance,display_partner:0 | 1581 | #: selection:account.partner.balance,display_partner:0 |
| 4239 | 1526 | #: selection:account.report.general.ledger,display_account:0 | 1582 | #: selection:account.report.general.ledger,display_account:0 |
| 4240 | 1527 | msgid "With balance is not equal to 0" | 1583 | msgid "With balance is not equal to 0" |
| 4241 | @@ -1751,6 +1807,10 @@ | |||
| 4242 | 1751 | #: view:account.invoice:0 | 1807 | #: view:account.invoice:0 |
| 4243 | 1752 | #: view:account.invoice.report:0 | 1808 | #: view:account.invoice.report:0 |
| 4244 | 1753 | #: field:account.move.line,invoice:0 | 1809 | #: field:account.move.line,invoice:0 |
| 4245 | 1810 | <<<<<<< TREE | ||
| 4246 | 1811 | ======= | ||
| 4247 | 1812 | #: code:addons/account/account_invoice.py:1157 | ||
| 4248 | 1813 | >>>>>>> MERGE-SOURCE | ||
| 4249 | 1754 | #: model:ir.model,name:account.model_account_invoice | 1814 | #: model:ir.model,name:account.model_account_invoice |
| 4250 | 1755 | #: model:res.request.link,name:account.req_link_invoice | 1815 | #: model:res.request.link,name:account.req_link_invoice |
| 4251 | 1756 | msgid "Invoice" | 1816 | msgid "Invoice" |
| 4252 | @@ -2001,11 +2061,20 @@ | |||
| 4253 | 2001 | #: code:addons/account/account_bank_statement.py:418 | 2061 | #: code:addons/account/account_bank_statement.py:418 |
| 4254 | 2002 | #: code:addons/account/account_cash_statement.py:256 | 2062 | #: code:addons/account/account_cash_statement.py:256 |
| 4255 | 2003 | #: code:addons/account/account_cash_statement.py:300 | 2063 | #: code:addons/account/account_cash_statement.py:300 |
| 4256 | 2064 | <<<<<<< TREE | ||
| 4257 | 2004 | #: code:addons/account/account_invoice.py:867 | 2065 | #: code:addons/account/account_invoice.py:867 |
| 4258 | 2005 | #: code:addons/account/account_invoice.py:901 | 2066 | #: code:addons/account/account_invoice.py:901 |
| 4259 | 2006 | #: code:addons/account/account_invoice.py:1091 | 2067 | #: code:addons/account/account_invoice.py:1091 |
| 4260 | 2007 | #: code:addons/account/account_move_line.py:578 | 2068 | #: code:addons/account/account_move_line.py:578 |
| 4261 | 2008 | #: code:addons/account/account_move_line.py:831 | 2069 | #: code:addons/account/account_move_line.py:831 |
| 4262 | 2070 | ======= | ||
| 4263 | 2071 | #: code:addons/account/account_invoice.py:899 | ||
| 4264 | 2072 | #: code:addons/account/account_invoice.py:933 | ||
| 4265 | 2073 | #: code:addons/account/account_invoice.py:1124 | ||
| 4266 | 2074 | #: code:addons/account/account_move_line.py:579 | ||
| 4267 | 2075 | #: code:addons/account/account_move_line.py:828 | ||
| 4268 | 2076 | #: code:addons/account/account_move_line.py:851 | ||
| 4269 | 2077 | >>>>>>> MERGE-SOURCE | ||
| 4270 | 2009 | #: code:addons/account/account_move_line.py:854 | 2078 | #: code:addons/account/account_move_line.py:854 |
| 4271 | 2010 | #: code:addons/account/account_move_line.py:857 | 2079 | #: code:addons/account/account_move_line.py:857 |
| 4272 | 2011 | #: code:addons/account/account_move_line.py:1122 | 2080 | #: code:addons/account/account_move_line.py:1122 |
| 4273 | @@ -2241,7 +2310,9 @@ | |||
| 4274 | 2241 | #: selection:account.common.partner.report,result_selection:0 | 2310 | #: selection:account.common.partner.report,result_selection:0 |
| 4275 | 2242 | #: selection:account.partner.balance,result_selection:0 | 2311 | #: selection:account.partner.balance,result_selection:0 |
| 4276 | 2243 | #: selection:account.partner.ledger,result_selection:0 | 2312 | #: selection:account.partner.ledger,result_selection:0 |
| 4277 | 2313 | #: report:account.third_party_ledger:0 | ||
| 4278 | 2244 | #: code:addons/account/report/account_partner_balance.py:299 | 2314 | #: code:addons/account/report/account_partner_balance.py:299 |
| 4279 | 2315 | #: code:addons/account/report/account_partner_ledger.py:274 | ||
| 4280 | 2245 | #, python-format | 2316 | #, python-format |
| 4281 | 2246 | msgid "Payable Accounts" | 2317 | msgid "Payable Accounts" |
| 4282 | 2247 | msgstr "Účty závazků" | 2318 | msgstr "Účty závazků" |
| 4283 | @@ -2548,7 +2619,11 @@ | |||
| 4284 | 2548 | msgstr "Vytvořit účet založený na šabloně" | 2619 | msgstr "Vytvořit účet založený na šabloně" |
| 4285 | 2549 | 2620 | ||
| 4286 | 2550 | #. module: account | 2621 | #. module: account |
| 4287 | 2622 | <<<<<<< TREE | ||
| 4288 | 2551 | #: code:addons/account/account_invoice.py:901 | 2623 | #: code:addons/account/account_invoice.py:901 |
| 4289 | 2624 | ======= | ||
| 4290 | 2625 | #: code:addons/account/account_invoice.py:933 | ||
| 4291 | 2626 | >>>>>>> MERGE-SOURCE | ||
| 4292 | 2552 | #, python-format | 2627 | #, python-format |
| 4293 | 2553 | msgid "" | 2628 | msgid "" |
| 4294 | 2554 | "Cannot create the invoice.\n" | 2629 | "Cannot create the invoice.\n" |
| 4295 | @@ -2813,6 +2888,7 @@ | |||
| 4296 | 2813 | msgstr "Účty" | 2888 | msgstr "Účty" |
| 4297 | 2814 | 2889 | ||
| 4298 | 2815 | #. module: account | 2890 | #. module: account |
| 4299 | 2891 | <<<<<<< TREE | ||
| 4300 | 2816 | #: code:addons/account/account.py:3503 | 2892 | #: code:addons/account/account.py:3503 |
| 4301 | 2817 | #: code:addons/account/account_bank_statement.py:404 | 2893 | #: code:addons/account/account_bank_statement.py:404 |
| 4302 | 2818 | #: code:addons/account/account_invoice.py:378 | 2894 | #: code:addons/account/account_invoice.py:378 |
| 4303 | @@ -2822,6 +2898,16 @@ | |||
| 4304 | 2822 | #: code:addons/account/account_invoice.py:605 | 2898 | #: code:addons/account/account_invoice.py:605 |
| 4305 | 2823 | #: code:addons/account/account_invoice.py:627 | 2899 | #: code:addons/account/account_invoice.py:627 |
| 4306 | 2824 | #: code:addons/account/account_move_line.py:535 | 2900 | #: code:addons/account/account_move_line.py:535 |
| 4307 | 2901 | ======= | ||
| 4308 | 2902 | #: code:addons/account/account.py:3541 | ||
| 4309 | 2903 | #: code:addons/account/account_bank_statement.py:405 | ||
| 4310 | 2904 | #: code:addons/account/account_invoice.py:507 | ||
| 4311 | 2905 | #: code:addons/account/account_invoice.py:609 | ||
| 4312 | 2906 | #: code:addons/account/account_invoice.py:624 | ||
| 4313 | 2907 | #: code:addons/account/account_invoice.py:632 | ||
| 4314 | 2908 | #: code:addons/account/account_invoice.py:657 | ||
| 4315 | 2909 | #: code:addons/account/account_move_line.py:536 | ||
| 4316 | 2910 | >>>>>>> MERGE-SOURCE | ||
| 4317 | 2825 | #, python-format | 2911 | #, python-format |
| 4318 | 2826 | msgid "Configuration Error!" | 2912 | msgid "Configuration Error!" |
| 4319 | 2827 | msgstr "Konfigurační chyba!" | 2913 | msgstr "Konfigurační chyba!" |
| 4320 | @@ -3044,8 +3130,13 @@ | |||
| 4321 | 3044 | msgstr "" | 3130 | msgstr "" |
| 4322 | 3045 | 3131 | ||
| 4323 | 3046 | #. module: account | 3132 | #. module: account |
| 4324 | 3133 | <<<<<<< TREE | ||
| 4325 | 3047 | #: code:addons/account/account.py:2308 | 3134 | #: code:addons/account/account.py:2308 |
| 4326 | 3048 | #: code:addons/account/account_invoice.py:744 | 3135 | #: code:addons/account/account_invoice.py:744 |
| 4327 | 3136 | ======= | ||
| 4328 | 3137 | #: code:addons/account/account.py:2346 | ||
| 4329 | 3138 | #: code:addons/account/account_invoice.py:775 | ||
| 4330 | 3139 | >>>>>>> MERGE-SOURCE | ||
| 4331 | 3049 | #: code:addons/account/account_move_line.py:195 | 3140 | #: code:addons/account/account_move_line.py:195 |
| 4332 | 3050 | #, python-format | 3141 | #, python-format |
| 4333 | 3051 | msgid "You have to define an analytic journal on the '%s' journal!" | 3142 | msgid "You have to define an analytic journal on the '%s' journal!" |
| 4334 | @@ -3106,6 +3197,11 @@ | |||
| 4335 | 3106 | msgstr "" | 3197 | msgstr "" |
| 4336 | 3107 | 3198 | ||
| 4337 | 3108 | #. module: account | 3199 | #. module: account |
| 4338 | 3200 | #: report:account.journal.period.print:0 | ||
| 4339 | 3201 | msgid "Reference Number" | ||
| 4340 | 3202 | msgstr "Referenční číslo" | ||
| 4341 | 3203 | |||
| 4342 | 3204 | #. module: account | ||
| 4343 | 3109 | #: selection:account.entries.report,month:0 | 3205 | #: selection:account.entries.report,month:0 |
| 4344 | 3110 | #: selection:account.invoice.report,month:0 | 3206 | #: selection:account.invoice.report,month:0 |
| 4345 | 3111 | #: selection:analytic.entries.report,month:0 | 3207 | #: selection:analytic.entries.report,month:0 |
| 4346 | @@ -3204,7 +3300,11 @@ | |||
| 4347 | 3204 | msgstr "Finanční pozice" | 3300 | msgstr "Finanční pozice" |
| 4348 | 3205 | 3301 | ||
| 4349 | 3206 | #. module: account | 3302 | #. module: account |
| 4350 | 3303 | <<<<<<< TREE | ||
| 4351 | 3207 | #: code:addons/account/account_invoice.py:791 | 3304 | #: code:addons/account/account_invoice.py:791 |
| 4352 | 3305 | ======= | ||
| 4353 | 3306 | #: code:addons/account/account_invoice.py:823 | ||
| 4354 | 3307 | >>>>>>> MERGE-SOURCE | ||
| 4355 | 3208 | #, python-format | 3308 | #, python-format |
| 4356 | 3209 | msgid "" | 3309 | msgid "" |
| 4357 | 3210 | "Tax base different!\n" | 3310 | "Tax base different!\n" |
| 4358 | @@ -3360,8 +3460,13 @@ | |||
| 4359 | 3360 | msgstr "Pohled" | 3460 | msgstr "Pohled" |
| 4360 | 3361 | 3461 | ||
| 4361 | 3362 | #. module: account | 3462 | #. module: account |
| 4362 | 3463 | <<<<<<< TREE | ||
| 4363 | 3363 | #: code:addons/account/account.py:3422 | 3464 | #: code:addons/account/account.py:3422 |
| 4364 | 3364 | #: code:addons/account/account_bank.py:95 | 3465 | #: code:addons/account/account_bank.py:95 |
| 4365 | 3466 | ======= | ||
| 4366 | 3467 | #: code:addons/account/account.py:3460 | ||
| 4367 | 3468 | #: code:addons/account/account_bank.py:94 | ||
| 4368 | 3469 | >>>>>>> MERGE-SOURCE | ||
| 4369 | 3365 | #, python-format | 3470 | #, python-format |
| 4370 | 3366 | msgid "BNK" | 3471 | msgid "BNK" |
| 4371 | 3367 | msgstr "BNK" | 3472 | msgstr "BNK" |
| 4372 | @@ -3621,7 +3726,11 @@ | |||
| 4373 | 3621 | "účetní záznamy." | 3726 | "účetní záznamy." |
| 4374 | 3622 | 3727 | ||
| 4375 | 3623 | #. module: account | 3728 | #. module: account |
| 4376 | 3729 | <<<<<<< TREE | ||
| 4377 | 3624 | #: code:addons/account/account_invoice.py:984 | 3730 | #: code:addons/account/account_invoice.py:984 |
| 4378 | 3731 | ======= | ||
| 4379 | 3732 | #: code:addons/account/account_invoice.py:1016 | ||
| 4380 | 3733 | >>>>>>> MERGE-SOURCE | ||
| 4381 | 3625 | #, python-format | 3734 | #, python-format |
| 4382 | 3626 | msgid "" | 3735 | msgid "" |
| 4383 | 3627 | "You cannot create an invoice on a centralized journal. Uncheck the " | 3736 | "You cannot create an invoice on a centralized journal. Uncheck the " |
| 4384 | @@ -3636,7 +3745,11 @@ | |||
| 4385 | 3636 | msgstr "Počáteční zůstatek" | 3745 | msgstr "Počáteční zůstatek" |
| 4386 | 3637 | 3746 | ||
| 4387 | 3638 | #. module: account | 3747 | #. module: account |
| 4388 | 3748 | <<<<<<< TREE | ||
| 4389 | 3639 | #: code:addons/account/account_invoice.py:1434 | 3749 | #: code:addons/account/account_invoice.py:1434 |
| 4390 | 3750 | ======= | ||
| 4391 | 3751 | #: code:addons/account/account_invoice.py:1465 | ||
| 4392 | 3752 | >>>>>>> MERGE-SOURCE | ||
| 4393 | 3640 | #, python-format | 3753 | #, python-format |
| 4394 | 3641 | msgid "No Partner Defined !" | 3754 | msgid "No Partner Defined !" |
| 4395 | 3642 | msgstr "Nebyl definován partner !" | 3755 | msgstr "Nebyl definován partner !" |
| 4396 | @@ -3902,14 +4015,21 @@ | |||
| 4397 | 3902 | msgstr "" | 4015 | msgstr "" |
| 4398 | 3903 | 4016 | ||
| 4399 | 3904 | #. module: account | 4017 | #. module: account |
| 4400 | 4018 | <<<<<<< TREE | ||
| 4401 | 3905 | #: report:account.invoice:0 | 4019 | #: report:account.invoice:0 |
| 4402 | 3906 | msgid "VAT :" | 4020 | msgid "VAT :" |
| 4403 | 3907 | msgstr "DPH :" | 4021 | msgstr "DPH :" |
| 4404 | 3908 | 4022 | ||
| 4405 | 3909 | #. module: account | 4023 | #. module: account |
| 4406 | 4024 | ======= | ||
| 4407 | 4025 | #: report:account.account.balance:0 | ||
| 4408 | 4026 | >>>>>>> MERGE-SOURCE | ||
| 4409 | 3910 | #: report:account.central.journal:0 | 4027 | #: report:account.central.journal:0 |
| 4410 | 3911 | #: view:account.config.settings:0 | 4028 | #: view:account.config.settings:0 |
| 4411 | 4029 | #: report:account.general.journal:0 | ||
| 4412 | 3912 | #: report:account.general.ledger:0 | 4030 | #: report:account.general.ledger:0 |
| 4413 | 4031 | #: report:account.general.ledger_landscape:0 | ||
| 4414 | 4032 | #: report:account.journal.period.print:0 | ||
| 4415 | 3913 | #: report:account.partner.balance:0 | 4033 | #: report:account.partner.balance:0 |
| 4416 | 3914 | #: report:account.third_party_ledger:0 | 4034 | #: report:account.third_party_ledger:0 |
| 4417 | 3915 | #: report:account.third_party_ledger_other:0 | 4035 | #: report:account.third_party_ledger_other:0 |
| 4418 | @@ -4269,7 +4389,11 @@ | |||
| 4419 | 4269 | msgstr "Konsolidovaný potomek" | 4389 | msgstr "Konsolidovaný potomek" |
| 4420 | 4270 | 4390 | ||
| 4421 | 4271 | #. module: account | 4391 | #. module: account |
| 4422 | 4392 | <<<<<<< TREE | ||
| 4423 | 4272 | #: code:addons/account/account_invoice.py:550 | 4393 | #: code:addons/account/account_invoice.py:550 |
| 4424 | 4394 | ======= | ||
| 4425 | 4395 | #: code:addons/account/account_invoice.py:573 | ||
| 4426 | 4396 | >>>>>>> MERGE-SOURCE | ||
| 4427 | 4273 | #: code:addons/account/wizard/account_invoice_refund.py:146 | 4397 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
| 4428 | 4274 | #, python-format | 4398 | #, python-format |
| 4429 | 4275 | msgid "Insufficient Data!" | 4399 | msgid "Insufficient Data!" |
| 4430 | @@ -4537,8 +4661,13 @@ | |||
| 4431 | 4537 | msgstr "" | 4661 | msgstr "" |
| 4432 | 4538 | 4662 | ||
| 4433 | 4539 | #. module: account | 4663 | #. module: account |
| 4434 | 4664 | <<<<<<< TREE | ||
| 4435 | 4540 | #: code:addons/account/account_invoice.py:583 | 4665 | #: code:addons/account/account_invoice.py:583 |
| 4436 | 4541 | #: code:addons/account/account_invoice.py:598 | 4666 | #: code:addons/account/account_invoice.py:598 |
| 4437 | 4667 | ======= | ||
| 4438 | 4668 | #: code:addons/account/account_invoice.py:610 | ||
| 4439 | 4669 | #: code:addons/account/account_invoice.py:625 | ||
| 4440 | 4670 | >>>>>>> MERGE-SOURCE | ||
| 4441 | 4542 | #, python-format | 4671 | #, python-format |
| 4442 | 4543 | msgid "" | 4672 | msgid "" |
| 4443 | 4544 | "Cannot find a chart of account, you should create one from Settings\\" | 4673 | "Cannot find a chart of account, you should create one from Settings\\" |
| 4444 | @@ -4811,7 +4940,11 @@ | |||
| 4445 | 4811 | msgstr "" | 4940 | msgstr "" |
| 4446 | 4812 | 4941 | ||
| 4447 | 4813 | #. module: account | 4942 | #. module: account |
| 4448 | 4943 | <<<<<<< TREE | ||
| 4449 | 4814 | #: code:addons/account/account_invoice.py:627 | 4944 | #: code:addons/account/account_invoice.py:627 |
| 4450 | 4945 | ======= | ||
| 4451 | 4946 | #: code:addons/account/account_invoice.py:658 | ||
| 4452 | 4947 | >>>>>>> MERGE-SOURCE | ||
| 4453 | 4815 | #, python-format | 4948 | #, python-format |
| 4454 | 4816 | msgid "" | 4949 | msgid "" |
| 4455 | 4817 | "Cannot find any account journal of %s type for this company.\n" | 4950 | "Cannot find any account journal of %s type for this company.\n" |
| 4456 | @@ -5135,7 +5268,11 @@ | |||
| 4457 | 5135 | msgstr "Daňová aplikace" | 5268 | msgstr "Daňová aplikace" |
| 4458 | 5136 | 5269 | ||
| 4459 | 5137 | #. module: account | 5270 | #. module: account |
| 4460 | 5271 | <<<<<<< TREE | ||
| 4461 | 5138 | #: code:addons/account/account_invoice.py:890 | 5272 | #: code:addons/account/account_invoice.py:890 |
| 4462 | 5273 | ======= | ||
| 4463 | 5274 | #: code:addons/account/account_invoice.py:922 | ||
| 4464 | 5275 | >>>>>>> MERGE-SOURCE | ||
| 4465 | 5139 | #, python-format | 5276 | #, python-format |
| 4466 | 5140 | msgid "" | 5277 | msgid "" |
| 4467 | 5141 | "Please verify the price of the invoice !\n" | 5278 | "Please verify the price of the invoice !\n" |
| 4468 | @@ -5462,7 +5599,11 @@ | |||
| 4469 | 5462 | msgstr "Vypočítat kód (pokud typ = kód)" | 5599 | msgstr "Vypočítat kód (pokud typ = kód)" |
| 4470 | 5463 | 5600 | ||
| 4471 | 5464 | #. module: account | 5601 | #. module: account |
| 4472 | 5602 | <<<<<<< TREE | ||
| 4473 | 5465 | #: code:addons/account/account_invoice.py:485 | 5603 | #: code:addons/account/account_invoice.py:485 |
| 4474 | 5604 | ======= | ||
| 4475 | 5605 | #: code:addons/account/account_invoice.py:508 | ||
| 4476 | 5606 | >>>>>>> MERGE-SOURCE | ||
| 4477 | 5466 | #, python-format | 5607 | #, python-format |
| 4478 | 5467 | msgid "" | 5608 | msgid "" |
| 4479 | 5468 | "Cannot find a chart of accounts for this company, you should create one." | 5609 | "Cannot find a chart of accounts for this company, you should create one." |
| 4480 | @@ -5848,6 +5989,18 @@ | |||
| 4481 | 5848 | msgstr "" | 5989 | msgstr "" |
| 4482 | 5849 | 5990 | ||
| 4483 | 5850 | #. module: account | 5991 | #. module: account |
| 4484 | 5992 | <<<<<<< TREE | ||
| 4485 | 5993 | ======= | ||
| 4486 | 5994 | #: code:addons/account/account_invoice.py:474 | ||
| 4487 | 5995 | #, python-format | ||
| 4488 | 5996 | msgid "" | ||
| 4489 | 5997 | "You cannot delete an invoice after it has been validated (and received a " | ||
| 4490 | 5998 | "number). You can set it back to \"Draft\" state and modify its content, " | ||
| 4491 | 5999 | "then re-confirm it." | ||
| 4492 | 6000 | msgstr "" | ||
| 4493 | 6001 | |||
| 4494 | 6002 | #. module: account | ||
| 4495 | 6003 | >>>>>>> MERGE-SOURCE | ||
| 4496 | 5851 | #: help:account.automatic.reconcile,power:0 | 6004 | #: help:account.automatic.reconcile,power:0 |
| 4497 | 5852 | msgid "" | 6005 | msgid "" |
| 4498 | 5853 | "Number of partial amounts that can be combined to find a balance point can " | 6006 | "Number of partial amounts that can be combined to find a balance point can " |
| 4499 | @@ -6001,7 +6154,11 @@ | |||
| 4500 | 6001 | #: view:account.config.settings:0 | 6154 | #: view:account.config.settings:0 |
| 4501 | 6002 | #: view:account.invoice:0 | 6155 | #: view:account.invoice:0 |
| 4502 | 6003 | #: view:account.invoice.report:0 | 6156 | #: view:account.invoice.report:0 |
| 4503 | 6157 | <<<<<<< TREE | ||
| 4504 | 6004 | #: code:addons/account/account_invoice.py:355 | 6158 | #: code:addons/account/account_invoice.py:355 |
| 4505 | 6159 | ======= | ||
| 4506 | 6160 | #: code:addons/account/account_invoice.py:390 | ||
| 4507 | 6161 | >>>>>>> MERGE-SOURCE | ||
| 4508 | 6005 | #, python-format | 6162 | #, python-format |
| 4509 | 6006 | msgid "Supplier" | 6163 | msgid "Supplier" |
| 4510 | 6007 | msgstr "Dodavatel" | 6164 | msgstr "Dodavatel" |
| 4511 | @@ -6021,7 +6178,7 @@ | |||
| 4512 | 6021 | msgstr "Účet n°" | 6178 | msgstr "Účet n°" |
| 4513 | 6022 | 6179 | ||
| 4514 | 6023 | #. module: account | 6180 | #. module: account |
| 4516 | 6024 | #: code:addons/account/account_invoice.py:92 | 6181 | #: code:addons/account/account_invoice.py:95 |
| 4517 | 6025 | #, python-format | 6182 | #, python-format |
| 4518 | 6026 | msgid "Free Reference" | 6183 | msgid "Free Reference" |
| 4519 | 6027 | msgstr "" | 6184 | msgstr "" |
| 4520 | @@ -6031,7 +6188,9 @@ | |||
| 4521 | 6031 | #: selection:account.common.partner.report,result_selection:0 | 6188 | #: selection:account.common.partner.report,result_selection:0 |
| 4522 | 6032 | #: selection:account.partner.balance,result_selection:0 | 6189 | #: selection:account.partner.balance,result_selection:0 |
| 4523 | 6033 | #: selection:account.partner.ledger,result_selection:0 | 6190 | #: selection:account.partner.ledger,result_selection:0 |
| 4524 | 6191 | #: report:account.third_party_ledger:0 | ||
| 4525 | 6034 | #: code:addons/account/report/account_partner_balance.py:301 | 6192 | #: code:addons/account/report/account_partner_balance.py:301 |
| 4526 | 6193 | #: code:addons/account/report/account_partner_ledger.py:276 | ||
| 4527 | 6035 | #, python-format | 6194 | #, python-format |
| 4528 | 6036 | msgid "Receivable and Payable Accounts" | 6195 | msgid "Receivable and Payable Accounts" |
| 4529 | 6037 | msgstr "Účty závazků a pohledávek" | 6196 | msgstr "Účty závazků a pohledávek" |
| 4530 | @@ -6332,7 +6491,11 @@ | |||
| 4531 | 6332 | msgstr "" | 6491 | msgstr "" |
| 4532 | 6333 | 6492 | ||
| 4533 | 6334 | #. module: account | 6493 | #. module: account |
| 4534 | 6494 | <<<<<<< TREE | ||
| 4535 | 6335 | #: code:addons/account/account_invoice.py:1091 | 6495 | #: code:addons/account/account_invoice.py:1091 |
| 4536 | 6496 | ======= | ||
| 4537 | 6497 | #: code:addons/account/account_invoice.py:1124 | ||
| 4538 | 6498 | >>>>>>> MERGE-SOURCE | ||
| 4539 | 6336 | #, python-format | 6499 | #, python-format |
| 4540 | 6337 | msgid "" | 6500 | msgid "" |
| 4541 | 6338 | "You cannot cancel an invoice which is partially paid. You need to " | 6501 | "You cannot cancel an invoice which is partially paid. You need to " |
| 4542 | @@ -6504,7 +6667,11 @@ | |||
| 4543 | 6504 | msgstr "" | 6667 | msgstr "" |
| 4544 | 6505 | 6668 | ||
| 4545 | 6506 | #. module: account | 6669 | #. module: account |
| 4546 | 6670 | <<<<<<< TREE | ||
| 4547 | 6507 | #: code:addons/account/account_invoice.py:606 | 6671 | #: code:addons/account/account_invoice.py:606 |
| 4548 | 6672 | ======= | ||
| 4549 | 6673 | #: code:addons/account/account_invoice.py:633 | ||
| 4550 | 6674 | >>>>>>> MERGE-SOURCE | ||
| 4551 | 6508 | #, python-format | 6675 | #, python-format |
| 4552 | 6509 | msgid "Invoice line account's company and invoice's compnay does not match." | 6676 | msgid "Invoice line account's company and invoice's compnay does not match." |
| 4553 | 6510 | msgstr "" | 6677 | msgstr "" |
| 4554 | @@ -6652,12 +6819,21 @@ | |||
| 4555 | 6652 | "daňových potomků. V tomto případě je vyhodnocení pořadí důležité." | 6819 | "daňových potomků. V tomto případě je vyhodnocení pořadí důležité." |
| 4556 | 6653 | 6820 | ||
| 4557 | 6654 | #. module: account | 6821 | #. module: account |
| 4558 | 6822 | <<<<<<< TREE | ||
| 4559 | 6655 | #: code:addons/account/account.py:1410 | 6823 | #: code:addons/account/account.py:1410 |
| 4560 | 6656 | #: code:addons/account/account.py:1415 | 6824 | #: code:addons/account/account.py:1415 |
| 4561 | 6657 | #: code:addons/account/account.py:1444 | 6825 | #: code:addons/account/account.py:1444 |
| 4562 | 6658 | #: code:addons/account/account.py:1451 | 6826 | #: code:addons/account/account.py:1451 |
| 4563 | 6659 | #: code:addons/account/account_invoice.py:983 | 6827 | #: code:addons/account/account_invoice.py:983 |
| 4564 | 6660 | #: code:addons/account/account_move_line.py:1008 | 6828 | #: code:addons/account/account_move_line.py:1008 |
| 4565 | 6829 | ======= | ||
| 4566 | 6830 | #: code:addons/account/account.py:1448 | ||
| 4567 | 6831 | #: code:addons/account/account.py:1453 | ||
| 4568 | 6832 | #: code:addons/account/account.py:1482 | ||
| 4569 | 6833 | #: code:addons/account/account.py:1489 | ||
| 4570 | 6834 | #: code:addons/account/account_invoice.py:1015 | ||
| 4571 | 6835 | #: code:addons/account/account_move_line.py:1005 | ||
| 4572 | 6836 | >>>>>>> MERGE-SOURCE | ||
| 4573 | 6661 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 | 6837 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
| 4574 | 6662 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 | 6838 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
| 4575 | 6663 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 | 6839 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
| 4576 | @@ -6735,6 +6911,10 @@ | |||
| 4577 | 6735 | #: report:account.invoice:0 | 6911 | #: report:account.invoice:0 |
| 4578 | 6736 | #: selection:account.invoice,type:0 | 6912 | #: selection:account.invoice,type:0 |
| 4579 | 6737 | #: selection:account.invoice.report,type:0 | 6913 | #: selection:account.invoice.report,type:0 |
| 4580 | 6914 | <<<<<<< TREE | ||
| 4581 | 6915 | ======= | ||
| 4582 | 6916 | #: code:addons/account/account_invoice.py:1160 | ||
| 4583 | 6917 | >>>>>>> MERGE-SOURCE | ||
| 4584 | 6738 | #: selection:report.invoice.created,type:0 | 6918 | #: selection:report.invoice.created,type:0 |
| 4585 | 6739 | msgid "Supplier Refund" | 6919 | msgid "Supplier Refund" |
| 4586 | 6740 | msgstr "Dobropis dodavatele" | 6920 | msgstr "Dobropis dodavatele" |
| 4587 | @@ -7861,7 +8041,11 @@ | |||
| 4588 | 7861 | msgstr "Květen" | 8041 | msgstr "Květen" |
| 4589 | 7862 | 8042 | ||
| 4590 | 7863 | #. module: account | 8043 | #. module: account |
| 4591 | 8044 | <<<<<<< TREE | ||
| 4592 | 7864 | #: code:addons/account/account_invoice.py:788 | 8045 | #: code:addons/account/account_invoice.py:788 |
| 4593 | 8046 | ======= | ||
| 4594 | 8047 | #: code:addons/account/account_invoice.py:820 | ||
| 4595 | 8048 | >>>>>>> MERGE-SOURCE | ||
| 4596 | 7865 | #, python-format | 8049 | #, python-format |
| 4597 | 7866 | msgid "Global taxes defined, but they are not in invoice lines !" | 8050 | msgid "Global taxes defined, but they are not in invoice lines !" |
| 4598 | 7867 | msgstr "" | 8051 | msgstr "" |
| 4599 | @@ -7903,7 +8087,11 @@ | |||
| 4600 | 7903 | #: view:account.config.settings:0 | 8087 | #: view:account.config.settings:0 |
| 4601 | 7904 | #: view:account.invoice:0 | 8088 | #: view:account.invoice:0 |
| 4602 | 7905 | #: view:account.invoice.report:0 | 8089 | #: view:account.invoice.report:0 |
| 4603 | 8090 | <<<<<<< TREE | ||
| 4604 | 7906 | #: code:addons/account/account_invoice.py:353 | 8091 | #: code:addons/account/account_invoice.py:353 |
| 4605 | 8092 | ======= | ||
| 4606 | 8093 | #: code:addons/account/account_invoice.py:388 | ||
| 4607 | 8094 | >>>>>>> MERGE-SOURCE | ||
| 4608 | 7907 | #, python-format | 8095 | #, python-format |
| 4609 | 7908 | msgid "Customer" | 8096 | msgid "Customer" |
| 4610 | 7909 | msgstr "Zákazník" | 8097 | msgstr "Zákazník" |
| 4611 | @@ -8040,6 +8228,17 @@ | |||
| 4612 | 8040 | msgstr "Vyrovnávací transakce" | 8228 | msgstr "Vyrovnávací transakce" |
| 4613 | 8041 | 8229 | ||
| 4614 | 8042 | #. module: account | 8230 | #. module: account |
| 4615 | 8231 | <<<<<<< TREE | ||
| 4616 | 8232 | ======= | ||
| 4617 | 8233 | #: code:addons/account/account_invoice.py:472 | ||
| 4618 | 8234 | #, python-format | ||
| 4619 | 8235 | msgid "" | ||
| 4620 | 8236 | "You cannot delete an invoice which is not draft or cancelled. You should " | ||
| 4621 | 8237 | "refund it instead." | ||
| 4622 | 8238 | msgstr "" | ||
| 4623 | 8239 | |||
| 4624 | 8240 | #. module: account | ||
| 4625 | 8241 | >>>>>>> MERGE-SOURCE | ||
| 4626 | 8043 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement | 8242 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
| 4627 | 8044 | msgid "Legal Reports" | 8243 | msgid "Legal Reports" |
| 4628 | 8045 | msgstr "Zákonné výkazy" | 8244 | msgstr "Zákonné výkazy" |
| 4629 | @@ -8153,7 +8352,11 @@ | |||
| 4630 | 8153 | msgstr "Vyberte měnu pro použití na faktuře" | 8352 | msgstr "Vyberte měnu pro použití na faktuře" |
| 4631 | 8154 | 8353 | ||
| 4632 | 8155 | #. module: account | 8354 | #. module: account |
| 4633 | 8355 | <<<<<<< TREE | ||
| 4634 | 8156 | #: code:addons/account/account_invoice.py:869 | 8356 | #: code:addons/account/account_invoice.py:869 |
| 4635 | 8357 | ======= | ||
| 4636 | 8358 | #: code:addons/account/account_invoice.py:901 | ||
| 4637 | 8359 | >>>>>>> MERGE-SOURCE | ||
| 4638 | 8157 | #, python-format | 8360 | #, python-format |
| 4639 | 8158 | msgid "No Invoice Lines !" | 8361 | msgid "No Invoice Lines !" |
| 4640 | 8159 | msgstr "Žádné řádky faktury !" | 8362 | msgstr "Žádné řádky faktury !" |
| 4641 | @@ -8230,7 +8433,11 @@ | |||
| 4642 | 8230 | msgstr "Přidruženého partnera" | 8433 | msgstr "Přidruženého partnera" |
| 4643 | 8231 | 8434 | ||
| 4644 | 8232 | #. module: account | 8435 | #. module: account |
| 4645 | 8436 | <<<<<<< TREE | ||
| 4646 | 8233 | #: code:addons/account/account_invoice.py:1434 | 8437 | #: code:addons/account/account_invoice.py:1434 |
| 4647 | 8438 | ======= | ||
| 4648 | 8439 | #: code:addons/account/account_invoice.py:1465 | ||
| 4649 | 8440 | >>>>>>> MERGE-SOURCE | ||
| 4650 | 8234 | #, python-format | 8441 | #, python-format |
| 4651 | 8235 | msgid "You must first select a partner !" | 8442 | msgid "You must first select a partner !" |
| 4652 | 8236 | msgstr "Musíte nejdříve vybrat partnera !" | 8443 | msgstr "Musíte nejdříve vybrat partnera !" |
| 4653 | @@ -9178,7 +9385,11 @@ | |||
| 4654 | 9178 | msgstr "Daň nákupu(%)" | 9385 | msgstr "Daň nákupu(%)" |
| 4655 | 9179 | 9386 | ||
| 4656 | 9180 | #. module: account | 9387 | #. module: account |
| 4657 | 9388 | <<<<<<< TREE | ||
| 4658 | 9181 | #: code:addons/account/account_invoice.py:869 | 9389 | #: code:addons/account/account_invoice.py:869 |
| 4659 | 9390 | ======= | ||
| 4660 | 9391 | #: code:addons/account/account_invoice.py:901 | ||
| 4661 | 9392 | >>>>>>> MERGE-SOURCE | ||
| 4662 | 9182 | #, python-format | 9393 | #, python-format |
| 4663 | 9183 | msgid "Please create some invoice lines." | 9394 | msgid "Please create some invoice lines." |
| 4664 | 9184 | msgstr "Prosíme vytvořete nějaké řádky faktury." | 9395 | msgstr "Prosíme vytvořete nějaké řádky faktury." |
| 4665 | @@ -9734,7 +9945,11 @@ | |||
| 4666 | 9734 | msgstr "Nevyrovnaný" | 9945 | msgstr "Nevyrovnaný" |
| 4667 | 9735 | 9946 | ||
| 4668 | 9736 | #. module: account | 9947 | #. module: account |
| 4669 | 9948 | <<<<<<< TREE | ||
| 4670 | 9737 | #: code:addons/account/account_invoice.py:890 | 9949 | #: code:addons/account/account_invoice.py:890 |
| 4671 | 9950 | ======= | ||
| 4672 | 9951 | #: code:addons/account/account_invoice.py:922 | ||
| 4673 | 9952 | >>>>>>> MERGE-SOURCE | ||
| 4674 | 9738 | #, python-format | 9953 | #, python-format |
| 4675 | 9739 | msgid "Bad total !" | 9954 | msgid "Bad total !" |
| 4676 | 9740 | msgstr "Špatný součet !" | 9955 | msgstr "Špatný součet !" |
| 4677 | @@ -10207,6 +10422,7 @@ | |||
| 4678 | 10207 | 10422 | ||
| 4679 | 10208 | #. module: account | 10423 | #. module: account |
| 4680 | 10209 | #: field:account.account,company_id:0 | 10424 | #: field:account.account,company_id:0 |
| 4681 | 10425 | #: report:account.account.balance:0 | ||
| 4682 | 10210 | #: field:account.aged.trial.balance,company_id:0 | 10426 | #: field:account.aged.trial.balance,company_id:0 |
| 4683 | 10211 | #: field:account.analytic.journal,company_id:0 | 10427 | #: field:account.analytic.journal,company_id:0 |
| 4684 | 10212 | #: field:account.balance.report,company_id:0 | 10428 | #: field:account.balance.report,company_id:0 |
| 4685 | @@ -10222,7 +10438,9 @@ | |||
| 4686 | 10222 | #: field:account.entries.report,company_id:0 | 10438 | #: field:account.entries.report,company_id:0 |
| 4687 | 10223 | #: field:account.fiscal.position,company_id:0 | 10439 | #: field:account.fiscal.position,company_id:0 |
| 4688 | 10224 | #: field:account.fiscalyear,company_id:0 | 10440 | #: field:account.fiscalyear,company_id:0 |
| 4689 | 10441 | #: report:account.general.journal:0 | ||
| 4690 | 10225 | #: field:account.general.journal,company_id:0 | 10442 | #: field:account.general.journal,company_id:0 |
| 4691 | 10443 | #: report:account.general.ledger_landscape:0 | ||
| 4692 | 10226 | #: field:account.installer,company_id:0 | 10444 | #: field:account.installer,company_id:0 |
| 4693 | 10227 | #: field:account.invoice,company_id:0 | 10445 | #: field:account.invoice,company_id:0 |
| 4694 | 10228 | #: field:account.invoice.line,company_id:0 | 10446 | #: field:account.invoice.line,company_id:0 |
| 4695 | @@ -10231,6 +10449,7 @@ | |||
| 4696 | 10231 | #: field:account.invoice.tax,company_id:0 | 10449 | #: field:account.invoice.tax,company_id:0 |
| 4697 | 10232 | #: field:account.journal,company_id:0 | 10450 | #: field:account.journal,company_id:0 |
| 4698 | 10233 | #: field:account.journal.period,company_id:0 | 10451 | #: field:account.journal.period,company_id:0 |
| 4699 | 10452 | #: report:account.journal.period.print:0 | ||
| 4700 | 10234 | #: field:account.model,company_id:0 | 10453 | #: field:account.model,company_id:0 |
| 4701 | 10235 | #: field:account.move,company_id:0 | 10454 | #: field:account.move,company_id:0 |
| 4702 | 10236 | #: field:account.move.line,company_id:0 | 10455 | #: field:account.move.line,company_id:0 |
| 4703 | @@ -10391,6 +10610,10 @@ | |||
| 4704 | 10391 | #: view:account.invoice:0 | 10610 | #: view:account.invoice:0 |
| 4705 | 10392 | #: selection:account.invoice,type:0 | 10611 | #: selection:account.invoice,type:0 |
| 4706 | 10393 | #: selection:account.invoice.report,type:0 | 10612 | #: selection:account.invoice.report,type:0 |
| 4707 | 10613 | <<<<<<< TREE | ||
| 4708 | 10614 | ======= | ||
| 4709 | 10615 | #: code:addons/account/account_invoice.py:1158 | ||
| 4710 | 10616 | >>>>>>> MERGE-SOURCE | ||
| 4711 | 10394 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 | 10617 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
| 4712 | 10395 | #: selection:report.invoice.created,type:0 | 10618 | #: selection:report.invoice.created,type:0 |
| 4713 | 10396 | msgid "Supplier Invoice" | 10619 | msgid "Supplier Invoice" |
| 4714 | @@ -10478,8 +10701,10 @@ | |||
| 4715 | 10478 | msgstr "" | 10701 | msgstr "" |
| 4716 | 10479 | 10702 | ||
| 4717 | 10480 | #. module: account | 10703 | #. module: account |
| 4718 | 10704 | #: report:account.account.balance:0 | ||
| 4719 | 10481 | #: selection:account.balance.report,display_account:0 | 10705 | #: selection:account.balance.report,display_account:0 |
| 4720 | 10482 | #: selection:account.common.account.report,display_account:0 | 10706 | #: selection:account.common.account.report,display_account:0 |
| 4721 | 10707 | #: report:account.general.ledger_landscape:0 | ||
| 4722 | 10483 | #: selection:account.report.general.ledger,display_account:0 | 10708 | #: selection:account.report.general.ledger,display_account:0 |
| 4723 | 10484 | msgid "With movements" | 10709 | msgid "With movements" |
| 4724 | 10485 | msgstr "S pohyby" | 10710 | msgstr "S pohyby" |
| 4725 | @@ -10574,7 +10799,11 @@ | |||
| 4726 | 10574 | msgstr "Položky řazené dle" | 10799 | msgstr "Položky řazené dle" |
| 4727 | 10575 | 10800 | ||
| 4728 | 10576 | #. module: account | 10801 | #. module: account |
| 4729 | 10802 | <<<<<<< TREE | ||
| 4730 | 10577 | #: code:addons/account/account_invoice.py:1515 | 10803 | #: code:addons/account/account_invoice.py:1515 |
| 4731 | 10804 | ======= | ||
| 4732 | 10805 | #: code:addons/account/account_invoice.py:1546 | ||
| 4733 | 10806 | >>>>>>> MERGE-SOURCE | ||
| 4734 | 10578 | #, python-format | 10807 | #, python-format |
| 4735 | 10579 | msgid "" | 10808 | msgid "" |
| 4736 | 10580 | "The selected unit of measure is not compatible with the unit of measure of " | 10809 | "The selected unit of measure is not compatible with the unit of measure of " |
| 4737 | @@ -10655,6 +10884,11 @@ | |||
| 4738 | 10655 | #: report:account.invoice:0 | 10884 | #: report:account.invoice:0 |
| 4739 | 10656 | #: view:account.invoice:0 | 10885 | #: view:account.invoice:0 |
| 4740 | 10657 | #: view:account.invoice.report:0 | 10886 | #: view:account.invoice.report:0 |
| 4741 | 10887 | <<<<<<< TREE | ||
| 4742 | 10888 | ======= | ||
| 4743 | 10889 | #: code:addons/account/account_invoice.py:1159 | ||
| 4744 | 10890 | #, python-format | ||
| 4745 | 10891 | >>>>>>> MERGE-SOURCE | ||
| 4746 | 10658 | msgid "Refund" | 10892 | msgid "Refund" |
| 4747 | 10659 | msgstr "Dobropis" | 10893 | msgstr "Dobropis" |
| 4748 | 10660 | 10894 | ||
| 4749 | @@ -10725,7 +10959,11 @@ | |||
| 4750 | 10725 | msgstr "Ruční daně faktury" | 10959 | msgstr "Ruční daně faktury" |
| 4751 | 10726 | 10960 | ||
| 4752 | 10727 | #. module: account | 10961 | #. module: account |
| 4753 | 10962 | <<<<<<< TREE | ||
| 4754 | 10728 | #: code:addons/account/account_invoice.py:550 | 10963 | #: code:addons/account/account_invoice.py:550 |
| 4755 | 10964 | ======= | ||
| 4756 | 10965 | #: code:addons/account/account_invoice.py:573 | ||
| 4757 | 10966 | >>>>>>> MERGE-SOURCE | ||
| 4758 | 10729 | #, python-format | 10967 | #, python-format |
| 4759 | 10730 | msgid "The payment term of supplier does not have a payment term line." | 10968 | msgid "The payment term of supplier does not have a payment term line." |
| 4760 | 10731 | msgstr "" | 10969 | msgstr "" |
| 4761 | 10732 | 10970 | ||
| 4762 | === modified file 'account/i18n/da.po' | |||
| 4763 | --- account/i18n/da.po 2013-06-13 18:15:03 +0000 | |||
| 4764 | +++ account/i18n/da.po 2013-06-19 09:20:00 +0000 | |||
| 4765 | @@ -7,15 +7,26 @@ | |||
| 4766 | 7 | msgstr "" | 7 | msgstr "" |
| 4767 | 8 | "Project-Id-Version: openobject-addons\n" | 8 | "Project-Id-Version: openobject-addons\n" |
| 4768 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
| 4769 | 10 | <<<<<<< TREE | ||
| 4770 | 10 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" | 11 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
| 4771 | 11 | "PO-Revision-Date: 2012-05-10 18:09+0000\n" | 12 | "PO-Revision-Date: 2012-05-10 18:09+0000\n" |
| 4772 | 12 | "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" | 13 | "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" |
| 4773 | 14 | ======= | ||
| 4774 | 15 | "POT-Creation-Date: 2013-06-14 22:29+0000\n" | ||
| 4775 | 16 | "PO-Revision-Date: 2012-12-21 23:00+0000\n" | ||
| 4776 | 17 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| 4777 | 18 | >>>>>>> MERGE-SOURCE | ||
| 4778 | 13 | "Language-Team: Danish <da@li.org>\n" | 19 | "Language-Team: Danish <da@li.org>\n" |
| 4779 | 14 | "MIME-Version: 1.0\n" | 20 | "MIME-Version: 1.0\n" |
| 4780 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 21 | "Content-Type: text/plain; charset=UTF-8\n" |
| 4781 | 16 | "Content-Transfer-Encoding: 8bit\n" | 22 | "Content-Transfer-Encoding: 8bit\n" |
| 4782 | 23 | <<<<<<< TREE | ||
| 4783 | 17 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" | 24 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" |
| 4784 | 18 | "X-Generator: Launchpad (build 16532)\n" | 25 | "X-Generator: Launchpad (build 16532)\n" |
| 4785 | 26 | ======= | ||
| 4786 | 27 | "X-Launchpad-Export-Date: 2013-06-15 06:14+0000\n" | ||
| 4787 | 28 | "X-Generator: Launchpad (build 16667)\n" | ||
| 4788 | 29 | >>>>>>> MERGE-SOURCE | ||
| 4789 | 19 | 30 | ||
| 4790 | 20 | #. module: account | 31 | #. module: account |
| 4791 | 21 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 | 32 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
| 4792 | @@ -128,11 +139,19 @@ | |||
| 4793 | 128 | #: code:addons/account/account.py:641 | 139 | #: code:addons/account/account.py:641 |
| 4794 | 129 | #: code:addons/account/account.py:686 | 140 | #: code:addons/account/account.py:686 |
| 4795 | 130 | #: code:addons/account/account.py:781 | 141 | #: code:addons/account/account.py:781 |
| 4796 | 142 | <<<<<<< TREE | ||
| 4797 | 131 | #: code:addons/account/account.py:1049 | 143 | #: code:addons/account/account.py:1049 |
| 4798 | 132 | #: code:addons/account/account_invoice.py:788 | 144 | #: code:addons/account/account_invoice.py:788 |
| 4799 | 133 | #: code:addons/account/account_invoice.py:791 | 145 | #: code:addons/account/account_invoice.py:791 |
| 4800 | 134 | #: code:addons/account/account_invoice.py:794 | 146 | #: code:addons/account/account_invoice.py:794 |
| 4801 | 135 | #: code:addons/account/account_invoice.py:1514 | 147 | #: code:addons/account/account_invoice.py:1514 |
| 4802 | 148 | ======= | ||
| 4803 | 149 | #: code:addons/account/account.py:1058 | ||
| 4804 | 150 | #: code:addons/account/account_invoice.py:820 | ||
| 4805 | 151 | #: code:addons/account/account_invoice.py:823 | ||
| 4806 | 152 | #: code:addons/account/account_invoice.py:826 | ||
| 4807 | 153 | #: code:addons/account/account_invoice.py:1545 | ||
| 4808 | 154 | >>>>>>> MERGE-SOURCE | ||
| 4809 | 136 | #: code:addons/account/account_move_line.py:98 | 155 | #: code:addons/account/account_move_line.py:98 |
| 4810 | 137 | #: code:addons/account/account_move_line.py:774 | 156 | #: code:addons/account/account_move_line.py:774 |
| 4811 | 138 | #: code:addons/account/account_move_line.py:827 | 157 | #: code:addons/account/account_move_line.py:827 |
| 4812 | @@ -332,7 +351,7 @@ | |||
| 4813 | 332 | msgstr "" | 351 | msgstr "" |
| 4814 | 333 | 352 | ||
| 4815 | 334 | #. module: account | 353 | #. module: account |
| 4817 | 335 | #: code:addons/account/account_invoice.py:74 | 354 | #: code:addons/account/account_invoice.py:77 |
| 4818 | 336 | #, python-format | 355 | #, python-format |
| 4819 | 337 | msgid "You must define an analytic journal of type '%s'!" | 356 | msgid "You must define an analytic journal of type '%s'!" |
| 4820 | 338 | msgstr "" | 357 | msgstr "" |
| 4821 | @@ -588,11 +607,23 @@ | |||
| 4822 | 588 | msgstr "" | 607 | msgstr "" |
| 4823 | 589 | 608 | ||
| 4824 | 590 | #. module: account | 609 | #. module: account |
| 4825 | 610 | <<<<<<< TREE | ||
| 4826 | 591 | #. openerp-web | 611 | #. openerp-web |
| 4827 | 592 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 | 612 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
| 4828 | 593 | #, python-format | 613 | #, python-format |
| 4829 | 594 | msgid "Nothing to reconcile" | 614 | msgid "Nothing to reconcile" |
| 4830 | 595 | msgstr "" | 615 | msgstr "" |
| 4831 | 616 | ======= | ||
| 4832 | 617 | #: report:account.account.balance:0 | ||
| 4833 | 618 | #: selection:account.balance.report,display_account:0 | ||
| 4834 | 619 | #: selection:account.common.account.report,display_account:0 | ||
| 4835 | 620 | #: report:account.general.ledger_landscape:0 | ||
| 4836 | 621 | #: selection:account.report.general.ledger,display_account:0 | ||
| 4837 | 622 | #: selection:account.tax,type_tax_use:0 | ||
| 4838 | 623 | #: selection:account.tax.template,type_tax_use:0 | ||
| 4839 | 624 | msgid "All" | ||
| 4840 | 625 | msgstr "Alle" | ||
| 4841 | 626 | >>>>>>> MERGE-SOURCE | ||
| 4842 | 596 | 627 | ||
| 4843 | 597 | #. module: account | 628 | #. module: account |
| 4844 | 598 | #: field:account.config.settings,decimal_precision:0 | 629 | #: field:account.config.settings,decimal_precision:0 |
| 4845 | @@ -723,7 +754,9 @@ | |||
| 4846 | 723 | #: selection:account.common.partner.report,result_selection:0 | 754 | #: selection:account.common.partner.report,result_selection:0 |
| 4847 | 724 | #: selection:account.partner.balance,result_selection:0 | 755 | #: selection:account.partner.balance,result_selection:0 |
| 4848 | 725 | #: selection:account.partner.ledger,result_selection:0 | 756 | #: selection:account.partner.ledger,result_selection:0 |
| 4849 | 757 | #: report:account.third_party_ledger:0 | ||
| 4850 | 726 | #: code:addons/account/report/account_partner_balance.py:297 | 758 | #: code:addons/account/report/account_partner_balance.py:297 |
| 4851 | 759 | #: code:addons/account/report/account_partner_ledger.py:272 | ||
| 4852 | 727 | #, python-format | 760 | #, python-format |
| 4853 | 728 | msgid "Receivable Accounts" | 761 | msgid "Receivable Accounts" |
| 4854 | 729 | msgstr "" | 762 | msgstr "" |
| 4855 | @@ -761,7 +794,11 @@ | |||
| 4856 | 761 | msgstr "" | 794 | msgstr "" |
| 4857 | 762 | 795 | ||
| 4858 | 763 | #. module: account | 796 | #. module: account |
| 4859 | 797 | <<<<<<< TREE | ||
| 4860 | 764 | #: code:addons/account/account_invoice.py:1330 | 798 | #: code:addons/account/account_invoice.py:1330 |
| 4861 | 799 | ======= | ||
| 4862 | 800 | #: code:addons/account/account_invoice.py:1361 | ||
| 4863 | 801 | >>>>>>> MERGE-SOURCE | ||
| 4864 | 765 | #, python-format | 802 | #, python-format |
| 4865 | 766 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." | 803 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
| 4866 | 767 | msgstr "" | 804 | msgstr "" |
| 4867 | @@ -830,7 +867,11 @@ | |||
| 4868 | 830 | msgstr "" | 867 | msgstr "" |
| 4869 | 831 | 868 | ||
| 4870 | 832 | #. module: account | 869 | #. module: account |
| 4871 | 870 | <<<<<<< TREE | ||
| 4872 | 833 | #: code:addons/account/account_invoice.py:794 | 871 | #: code:addons/account/account_invoice.py:794 |
| 4873 | 872 | ======= | ||
| 4874 | 873 | #: code:addons/account/account_invoice.py:826 | ||
| 4875 | 874 | >>>>>>> MERGE-SOURCE | ||
| 4876 | 834 | #, python-format | 875 | #, python-format |
| 4877 | 835 | msgid "" | 876 | msgid "" |
| 4878 | 836 | "Taxes are missing!\n" | 877 | "Taxes are missing!\n" |
| 4879 | @@ -1009,7 +1050,11 @@ | |||
| 4880 | 1009 | msgstr "" | 1050 | msgstr "" |
| 4881 | 1010 | 1051 | ||
| 4882 | 1011 | #. module: account | 1052 | #. module: account |
| 4883 | 1053 | <<<<<<< TREE | ||
| 4884 | 1012 | #: code:addons/account/account_invoice.py:867 | 1054 | #: code:addons/account/account_invoice.py:867 |
| 4885 | 1055 | ======= | ||
| 4886 | 1056 | #: code:addons/account/account_invoice.py:899 | ||
| 4887 | 1057 | >>>>>>> MERGE-SOURCE | ||
| 4888 | 1013 | #, python-format | 1058 | #, python-format |
| 4889 | 1014 | msgid "Please define sequence on the journal related to this invoice." | 1059 | msgid "Please define sequence on the journal related to this invoice." |
| 4890 | 1015 | msgstr "" | 1060 | msgstr "" |
| 4891 | @@ -1080,10 +1125,17 @@ | |||
| 4892 | 1080 | msgstr "" | 1125 | msgstr "" |
| 4893 | 1081 | 1126 | ||
| 4894 | 1082 | #. module: account | 1127 | #. module: account |
| 4895 | 1128 | <<<<<<< TREE | ||
| 4896 | 1083 | #: code:addons/account/account.py:2308 | 1129 | #: code:addons/account/account.py:2308 |
| 4897 | 1084 | #: code:addons/account/account_bank_statement.py:423 | 1130 | #: code:addons/account/account_bank_statement.py:423 |
| 4898 | 1085 | #: code:addons/account/account_invoice.py:74 | 1131 | #: code:addons/account/account_invoice.py:74 |
| 4899 | 1086 | #: code:addons/account/account_invoice.py:744 | 1132 | #: code:addons/account/account_invoice.py:744 |
| 4900 | 1133 | ======= | ||
| 4901 | 1134 | #: code:addons/account/account.py:2346 | ||
| 4902 | 1135 | #: code:addons/account/account_bank_statement.py:424 | ||
| 4903 | 1136 | #: code:addons/account/account_invoice.py:77 | ||
| 4904 | 1137 | #: code:addons/account/account_invoice.py:775 | ||
| 4905 | 1138 | >>>>>>> MERGE-SOURCE | ||
| 4906 | 1087 | #: code:addons/account/account_move_line.py:195 | 1139 | #: code:addons/account/account_move_line.py:195 |
| 4907 | 1088 | #, python-format | 1140 | #, python-format |
| 4908 | 1089 | msgid "No Analytic Journal !" | 1141 | msgid "No Analytic Journal !" |
| 4909 | @@ -1512,8 +1564,10 @@ | |||
| 4910 | 1512 | msgstr "" | 1564 | msgstr "" |
| 4911 | 1513 | 1565 | ||
| 4912 | 1514 | #. module: account | 1566 | #. module: account |
| 4913 | 1567 | #: report:account.account.balance:0 | ||
| 4914 | 1515 | #: selection:account.balance.report,display_account:0 | 1568 | #: selection:account.balance.report,display_account:0 |
| 4915 | 1516 | #: selection:account.common.account.report,display_account:0 | 1569 | #: selection:account.common.account.report,display_account:0 |
| 4916 | 1570 | #: report:account.general.ledger_landscape:0 | ||
| 4917 | 1517 | #: selection:account.partner.balance,display_partner:0 | 1571 | #: selection:account.partner.balance,display_partner:0 |
| 4918 | 1518 | #: selection:account.report.general.ledger,display_account:0 | 1572 | #: selection:account.report.general.ledger,display_account:0 |
| 4919 | 1519 | msgid "With balance is not equal to 0" | 1573 | msgid "With balance is not equal to 0" |
| 4920 | @@ -1743,6 +1797,10 @@ | |||
| 4921 | 1743 | #: view:account.invoice:0 | 1797 | #: view:account.invoice:0 |
| 4922 | 1744 | #: view:account.invoice.report:0 | 1798 | #: view:account.invoice.report:0 |
| 4923 | 1745 | #: field:account.move.line,invoice:0 | 1799 | #: field:account.move.line,invoice:0 |
| 4924 | 1800 | <<<<<<< TREE | ||
| 4925 | 1801 | ======= | ||
| 4926 | 1802 | #: code:addons/account/account_invoice.py:1157 | ||
| 4927 | 1803 | >>>>>>> MERGE-SOURCE | ||
| 4928 | 1746 | #: model:ir.model,name:account.model_account_invoice | 1804 | #: model:ir.model,name:account.model_account_invoice |
| 4929 | 1747 | #: model:res.request.link,name:account.req_link_invoice | 1805 | #: model:res.request.link,name:account.req_link_invoice |
| 4930 | 1748 | msgid "Invoice" | 1806 | msgid "Invoice" |
| 4931 | @@ -1991,11 +2049,20 @@ | |||
| 4932 | 1991 | #: code:addons/account/account_bank_statement.py:418 | 2049 | #: code:addons/account/account_bank_statement.py:418 |
| 4933 | 1992 | #: code:addons/account/account_cash_statement.py:256 | 2050 | #: code:addons/account/account_cash_statement.py:256 |
| 4934 | 1993 | #: code:addons/account/account_cash_statement.py:300 | 2051 | #: code:addons/account/account_cash_statement.py:300 |
| 4935 | 2052 | <<<<<<< TREE | ||
| 4936 | 1994 | #: code:addons/account/account_invoice.py:867 | 2053 | #: code:addons/account/account_invoice.py:867 |
| 4937 | 1995 | #: code:addons/account/account_invoice.py:901 | 2054 | #: code:addons/account/account_invoice.py:901 |
| 4938 | 1996 | #: code:addons/account/account_invoice.py:1091 | 2055 | #: code:addons/account/account_invoice.py:1091 |
| 4939 | 1997 | #: code:addons/account/account_move_line.py:578 | 2056 | #: code:addons/account/account_move_line.py:578 |
| 4940 | 1998 | #: code:addons/account/account_move_line.py:831 | 2057 | #: code:addons/account/account_move_line.py:831 |
| 4941 | 2058 | ======= | ||
| 4942 | 2059 | #: code:addons/account/account_invoice.py:899 | ||
| 4943 | 2060 | #: code:addons/account/account_invoice.py:933 | ||
| 4944 | 2061 | #: code:addons/account/account_invoice.py:1124 | ||
| 4945 | 2062 | #: code:addons/account/account_move_line.py:579 | ||
| 4946 | 2063 | #: code:addons/account/account_move_line.py:828 | ||
| 4947 | 2064 | #: code:addons/account/account_move_line.py:851 | ||
| 4948 | 2065 | >>>>>>> MERGE-SOURCE | ||
| 4949 | 1999 | #: code:addons/account/account_move_line.py:854 | 2066 | #: code:addons/account/account_move_line.py:854 |
| 4950 | 2000 | #: code:addons/account/account_move_line.py:857 | 2067 | #: code:addons/account/account_move_line.py:857 |
| 4951 | 2001 | #: code:addons/account/account_move_line.py:1122 | 2068 | #: code:addons/account/account_move_line.py:1122 |
| 4952 | @@ -2229,7 +2296,9 @@ | |||
| 4953 | 2229 | #: selection:account.common.partner.report,result_selection:0 | 2296 | #: selection:account.common.partner.report,result_selection:0 |
| 4954 | 2230 | #: selection:account.partner.balance,result_selection:0 | 2297 | #: selection:account.partner.balance,result_selection:0 |
| 4955 | 2231 | #: selection:account.partner.ledger,result_selection:0 | 2298 | #: selection:account.partner.ledger,result_selection:0 |
| 4956 | 2299 | #: report:account.third_party_ledger:0 | ||
| 4957 | 2232 | #: code:addons/account/report/account_partner_balance.py:299 | 2300 | #: code:addons/account/report/account_partner_balance.py:299 |
| 4958 | 2301 | #: code:addons/account/report/account_partner_ledger.py:274 | ||
| 4959 | 2233 | #, python-format | 2302 | #, python-format |
| 4960 | 2234 | msgid "Payable Accounts" | 2303 | msgid "Payable Accounts" |
| 4961 | 2235 | msgstr "" | 2304 | msgstr "" |
| 4962 | @@ -2534,7 +2603,11 @@ | |||
| 4963 | 2534 | msgstr "" | 2603 | msgstr "" |
| 4964 | 2535 | 2604 | ||
| 4965 | 2536 | #. module: account | 2605 | #. module: account |
| 4966 | 2606 | <<<<<<< TREE | ||
| 4967 | 2537 | #: code:addons/account/account_invoice.py:901 | 2607 | #: code:addons/account/account_invoice.py:901 |
| 4968 | 2608 | ======= | ||
| 4969 | 2609 | #: code:addons/account/account_invoice.py:933 | ||
| 4970 | 2610 | >>>>>>> MERGE-SOURCE | ||
| 4971 | 2538 | #, python-format | 2611 | #, python-format |
| 4972 | 2539 | msgid "" | 2612 | msgid "" |
| 4973 | 2540 | "Cannot create the invoice.\n" | 2613 | "Cannot create the invoice.\n" |
| 4974 | @@ -2804,6 +2877,7 @@ | |||
| 4975 | 2804 | msgstr "" | 2877 | msgstr "" |
| 4976 | 2805 | 2878 | ||
| 4977 | 2806 | #. module: account | 2879 | #. module: account |
| 4978 | 2880 | <<<<<<< TREE | ||
| 4979 | 2807 | #: code:addons/account/account.py:3503 | 2881 | #: code:addons/account/account.py:3503 |
| 4980 | 2808 | #: code:addons/account/account_bank_statement.py:404 | 2882 | #: code:addons/account/account_bank_statement.py:404 |
| 4981 | 2809 | #: code:addons/account/account_invoice.py:378 | 2883 | #: code:addons/account/account_invoice.py:378 |
| 4982 | @@ -2813,6 +2887,16 @@ | |||
| 4983 | 2813 | #: code:addons/account/account_invoice.py:605 | 2887 | #: code:addons/account/account_invoice.py:605 |
| 4984 | 2814 | #: code:addons/account/account_invoice.py:627 | 2888 | #: code:addons/account/account_invoice.py:627 |
| 4985 | 2815 | #: code:addons/account/account_move_line.py:535 | 2889 | #: code:addons/account/account_move_line.py:535 |
| 4986 | 2890 | ======= | ||
| 4987 | 2891 | #: code:addons/account/account.py:3541 | ||
| 4988 | 2892 | #: code:addons/account/account_bank_statement.py:405 | ||
| 4989 | 2893 | #: code:addons/account/account_invoice.py:507 | ||
| 4990 | 2894 | #: code:addons/account/account_invoice.py:609 | ||
| 4991 | 2895 | #: code:addons/account/account_invoice.py:624 | ||
| 4992 | 2896 | #: code:addons/account/account_invoice.py:632 | ||
| 4993 | 2897 | #: code:addons/account/account_invoice.py:657 | ||
| 4994 | 2898 | #: code:addons/account/account_move_line.py:536 | ||
| 4995 | 2899 | >>>>>>> MERGE-SOURCE | ||
| 4996 | 2816 | #, python-format | 2900 | #, python-format |
| 4997 | 2817 | msgid "Configuration Error!" | 2901 | msgid "Configuration Error!" |
| 4998 | 2818 | msgstr "" | 2902 | msgstr "" |
| 4999 | @@ -3035,8 +3119,13 @@ | |||
| 5000 | 3035 | msgstr "" | 3119 | msgstr "" |
The diff has been truncated for viewing.
