From 923b9f98507497cb75db9bf46f24b2932da99de9 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 26 Dec 2019 10:19:17 +0500 Subject: [PATCH 01/64] [FIX] seller phone --- data/fields_default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 10af36a..1e350bc 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -35,7 +35,7 @@ ctx = { "seller_ogrn": seller.psrn, "seller_bank": False, "seller_bank_account": False, - "seller_phone": partner.phone, + "seller_phone": seller.phone, "partner_company_name": partner.name, "partner_business_address": partner.full_address, From 0455159c2cf77a8a1af764cb402d31c83bbc83a4 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 26 Dec 2019 10:45:45 +0500 Subject: [PATCH 02/64] [ADD] corresponding account, rename bank_account to ks --- data/fields_default.xml | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 1e350bc..19fa29d 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -29,12 +29,16 @@ ctx = { "seller_representer_name_initials": seller.representative_id.name_initials_case, "seller_representer_function": seller.representative_id.function, "seller_representer_function_parent_case": seller.representative_id.function_parent_case, + "seller_inn": seller.inn, "seller_kpp": seller.kpp, "seller_bic": False, "seller_ogrn": seller.psrn, + "seller_bank": False, - "seller_bank_account": False, + "seller_rs": False, + "seller_ks": False, + "seller_phone": seller.phone, "partner_company_name": partner.name, @@ -44,12 +48,16 @@ ctx = { "partner_representer_name_initials": partner.representative_id.name_initials_case, "partner_representer_function": partner.representative_id.function, "partner_representer_function_parent_case": partner.representative_id.function_parent_case, + "partner_inn": partner.inn, "partner_kpp": partner.kpp, "partner_bic": False, "partner_ogrn": partner.psrn, + "partner_bank": False, - "partner_bank_account": False, + "partner_rs": False, + "partner_ks": False, + "partner_phone": partner.phone, } @@ -57,14 +65,16 @@ if partner_bank: ctx.update({ "partner_bic": partner_bank.bank_id.bic, "partner_bank": partner_bank.bank_id.name, - "partner_bank_account": partner_bank.acc_number, + "partner_rs": partner_bank.acc_number, + "partner_ks": partner_bank.bank_id.corr_account, }) if seller_bank: ctx.update({ "seller_bic": seller_bank.bank_id.bic, "seller_bank": seller_bank.bank_id.name, - "seller_bank_account": seller_bank.acc_number, + "seller_rs": seller_bank.acc_number, + "seller_ks": seller_bank.bank_id.corr_account, }) action = ctx @@ -243,9 +253,15 @@ action = ctx - + Seller Bank Account - seller_bank_account + seller_rs + + + + + Seller Corresponding Account + seller_ks @@ -330,9 +346,15 @@ action = ctx - + Partner Bank Account - partner_bank_account + partner_rs + + + + + Partner Corresponding Account + partner_ks From fa933cd9e4724e56621c83aebb5b541f2e320a28 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 26 Dec 2019 10:47:45 +0500 Subject: [PATCH 03/64] [IMP] change visibility domains field:create_date to field:id --- views/res_partner_contract.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/res_partner_contract.xml b/views/res_partner_contract.xml index c3f98f6..143ba07 100644 --- a/views/res_partner_contract.xml +++ b/views/res_partner_contract.xml @@ -20,7 +20,7 @@ res.partner.contract
-
+
+ From 782b6f20cde954845d2fbe8663a51f0d60419c4d Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 26 Dec 2019 15:31:33 +0500 Subject: [PATCH 14/64] [IMP] templates --- models/res_partner_contract.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index 555477c..c5978c2 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -98,23 +98,25 @@ class PartnerContract(models.Model): } -class PrintTemplateContract(models.Model): - _name = "res.partner.template.print.contract" - _description = "Print Template Contract" +class PrintTemplate(models.Model): + _name = "res.partner.template.print" + _description = "Print Template" name = fields.Char(related="attachment_id.name",) attachment_id = fields.Many2one( "ir.attachment", string="Template Attachment", required=True, ) - is_default = fields.Boolean(string="Default Template", default=False,) + individual = fields.Boolean(string="Individual",) + company = fields.Boolean(string="Company",) + + +class PrintTemplateContract(models.Model): + _name = "res.partner.template.print.contract" + _inherit = "res.partner.template.print" + _description = "Print Template Contract" class PrintTemplateAnnex(models.Model): _name = "res.partner.template.print.annex" + _inherit = "res.partner.template.print" _description = "Print Template Contract Annex" - - name = fields.Char(related="attachment_id.name",) - attachment_id = fields.Many2one( - "ir.attachment", string="Template Attachment", required=True, - ) - is_default = fields.Boolean(string="Default Template", default=False,) From 331963f1a97cbdcbf82f52556ed9dbab3405ac99 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 10:58:47 +0500 Subject: [PATCH 15/64] [ADD] representative document acts in contract --- models/res_partner.py | 3 +++ views/res_partner.xml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/models/res_partner.py b/models/res_partner.py index 8170d81..346fe1e 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -20,6 +20,9 @@ class ResPartner(models.Model): representative_id = fields.Many2one( "res.partner", string="Representative", help="Person, who represents company" ) + representative_document = fields.Char( + string="Representative acts on the basis of", help="Parent Case", + ) signature = fields.Binary(string="Client signature") @api.depends("street", "street2", "city", "state_id", "zip", "country_id") diff --git a/views/res_partner.xml b/views/res_partner.xml index 937d891..c2d63ec 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -43,6 +43,8 @@ + + From 7d52b1788be22152417c5f44518dbef2d6637adf Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 17:10:49 +0500 Subject: [PATCH 16/64] [ADD] representer document, passport, company_form, ip --- data/fields_default.xml | 103 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 93 insertions(+), 10 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 666de0e..601138d 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -182,9 +182,15 @@ action = ctx - - Seller Company Name - seller_company_name + + Seller Name + seller_name + + + + + Seller Institutional-Legal Form + seller_company_form @@ -210,6 +216,11 @@ action = ctx Seller Representer Initials Name seller_representer_name_initials + + + + Seller Representer Document Parent + seller_representer_document_parent @@ -219,9 +230,39 @@ action = ctx - + Seller Representer Function Parent Case - seller_representer_function_parent_case + seller_representer_function_parent + + + + + Seller Representer Passport Number + seller_representer_passport_number + + + + + Seller Representer Passport Date + seller_representer_passport_date + + + + + Seller Representer Passport Department + seller_representer_passport_department + + + + + Seller IP Number + seller_ip_number + + + + + Seller IP Date + seller_ip_date @@ -282,9 +323,15 @@ action = ctx - - Partner Company Name - partner_company_name + + Partner Name + partner_name + + + + + Partner Institutional-Legal Form + partner_company_form @@ -312,15 +359,51 @@ action = ctx + + Partner Representer Document Parent + partner_representer_document_parent + + + Partner Representer Function partner_representer_function - + Partner Representer Function Parent Case - partner_representer_function_parent_case + partner_representer_function_parent + + + + + Partner Representer Passport Number + partner_representer_passport_number + + + + + Partner Representer Passport Date + partner_representer_passport_date + + + + + Partner Representer Passport Department + partner_representer_passport_department + + + + + Partner IP Number + partner_ip_number + + + + + Partner IP Date + partner_ip_date From 599a89c806d693c90ccad219ebc32360da50466b Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 17:31:34 +0500 Subject: [PATCH 17/64] [FIX] contract fields --- data/fields_default.xml | 106 +++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 60 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 601138d..d71981c 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -22,63 +22,73 @@ ctx = { "contract_number": self.name, "date_conclusion": self.date_conclusion_fix or self.date_conclusion, - "seller_company_name": seller.name, - "seller_business_address": seller.full_address, + "seller_name": seller.name, + "seller_company_form": seller.company_form, "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_initials": seller.representative_id.name_initials_case, - "seller_representer_function": seller.representative_id.function, - "seller_representer_function_parent_case": seller.representative_id.function_parent_case, - "seller_inn": seller.vat, "seller_kpp": seller.iec, - "seller_bic": False, "seller_ogrn": seller.psrn, - - "seller_bank": False, - "seller_rs": False, - "seller_ks": False, - + "seller_business_address": seller.full_address, "seller_phone": seller.phone, "seller_email": seller.email, - "partner_company_name": partner.name, - "partner_business_address": partner.full_address, - "partner_representer_name": partner.representative_id.name, - "partner_representer_name_parent": partner.representative_id.name_parent_case, - "partner_representer_name_initials": partner.representative_id.name_initials_case, - "partner_representer_function": partner.representative_id.function, - "partner_representer_function_parent_case": partner.representative_id.function_parent_case, - "partner_inn": partner.vat, - "partner_kpp": partner.iec, - "partner_bic": False, - "partner_ogrn": partner.psrn, - - "partner_bank": False, - "partner_rs": False, - "partner_ks": False, - + "partner_business_address": partner.full_address, "partner_phone": partner.phone, "partner_email": partner.email, } if partner_bank: ctx.update({ - "partner_bic": partner_bank.bank_id.bic, - "partner_bank": partner_bank.bank_id.name, "partner_rs": partner_bank.acc_number, "partner_ks": partner_bank.bank_id.corr_account, + "partner_bic": partner_bank.bank_id.bic, }) - if seller_bank: ctx.update({ - "seller_bic": seller_bank.bank_id.bic, - "seller_bank": seller_bank.bank_id.name, "seller_rs": seller_bank.acc_number, "seller_ks": seller_bank.bank_id.corr_account, + "seller_bic": seller_bank.bank_id.bic, }) + +# Person +if not partner.is_company: + ctx.update({ + "partner_name": partner.name, + "partner_name_initials": partner.name_initials_case, # TODO: remove 'case' + "partner_passport_number": partner.passport_number, + "partner_passport_date": partner.passport_date, + "partner_passport_department": partner.passport_department, + }) +else: + # Company + ctx.update({ + "partner_name":, + "partner_company_form":, + "partner_representer_name":, + "partner_representer_name_parent":, + "partner_representer_name_initials":, + "partner_representer_document_parent":, + }) + + if partner.company_form == 'sp': + # Sole Proprietor + ctx.update({ + "partner_ip_number": partner.sp_register_number, + "partner_ip_date": partner.sp_register_date, + "partner_ogrnip": partner.psrn_sp, + }) + if partner.company_form == 'plc': + # Private Limited Company + ctx.update({ + "partner_kpp": partner.iec, + "partner_ogrn": partner.psrn, + }) + + action = ctx @@ -296,15 +306,9 @@ action = ctx - + Seller Bank Account - seller_rs - - - - - Seller Corresponding Account - seller_ks + seller_bank_account @@ -314,12 +318,6 @@ action = ctx - - Seller Email - seller_email - - - @@ -437,15 +435,9 @@ action = ctx - + Partner Bank Account - partner_rs - - - - - Partner Corresponding Account - partner_ks + partner_bank_account @@ -455,11 +447,5 @@ action = ctx - - Partner Email - partner_email - - - From 77ca108bef0087a4098a6a883dc538dbe15aa3f2 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 18:06:54 +0500 Subject: [PATCH 18/64] [ADD] selection of company type --- models/res_partner_contract.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index c5978c2..b5d5f7f 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -106,8 +106,13 @@ class PrintTemplate(models.Model): attachment_id = fields.Many2one( "ir.attachment", string="Template Attachment", required=True, ) - individual = fields.Boolean(string="Individual",) - company = fields.Boolean(string="Company",) + company_type = fields.Selection( + selection=[ + ('person', 'Individual'), + ('sp', 'Sole Proprietor'), + ('plc', 'Private Limited Company'), + ] + ) class PrintTemplateContract(models.Model): From 1ee2b26fe319a9328faa626e8fdaee2ae3937bcb Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 18:07:20 +0500 Subject: [PATCH 19/64] [ADD] domain to templates --- wizard/res_partner_contract_wizard.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wizard/res_partner_contract_wizard.py b/wizard/res_partner_contract_wizard.py index 1850249..3ecfc9a 100644 --- a/wizard/res_partner_contract_wizard.py +++ b/wizard/res_partner_contract_wizard.py @@ -104,6 +104,15 @@ class ContractWizard(models.TransientModel): for field, value in sorted(contract_context_values.items()) ] + # Set up template domain + company_type = self.partner_id.company_form if self.partner_id.is_company else 'person' + return { + 'domain': { + 'print_template_contract': [('company_type', '=', company_type)], + 'print_template_annex': [('company_type', '=', company_type)] + } + } + @api.multi def get_docx_contract(self): template = self._get_template() From 88481a40b851bb847baec2bfa0ff951506b59399 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 18:15:07 +0500 Subject: [PATCH 20/64] [FIX] contract fields --- data/fields_default.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index d71981c..63832f6 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -21,12 +21,13 @@ seller_bank = seller.bank_ids[0] ctx = { "contract_number": self.name, "date_conclusion": self.date_conclusion_fix or self.date_conclusion, - + "seller_name": seller.name, "seller_company_form": seller.company_form, "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_initials": seller.representative_id.name_initials_case, + "seller_representer_document_parent": seller.representative_id.representative_document, "seller_inn": seller.vat, "seller_kpp": seller.iec, "seller_ogrn": seller.psrn, @@ -34,6 +35,7 @@ ctx = { "seller_phone": seller.phone, "seller_email": seller.email, + "partner_name": partner.name, "partner_inn": partner.vat, "partner_business_address": partner.full_address, "partner_phone": partner.phone, @@ -57,7 +59,6 @@ if seller_bank: # Person if not partner.is_company: ctx.update({ - "partner_name": partner.name, "partner_name_initials": partner.name_initials_case, # TODO: remove 'case' "partner_passport_number": partner.passport_number, "partner_passport_date": partner.passport_date, @@ -66,12 +67,11 @@ if not partner.is_company: else: # Company ctx.update({ - "partner_name":, - "partner_company_form":, - "partner_representer_name":, - "partner_representer_name_parent":, - "partner_representer_name_initials":, - "partner_representer_document_parent":, + "partner_company_form": partner.company_form, + "partner_representer_name": partner.representative_id.name, + "partner_representer_name_parent": partner.representative_id.name_parent_case, + "partner_representer_name_initials": partner.representative_id.name_initials_case, + "partner_representer_document_parent": partner.representative_id.representative_document, }) if partner.company_form == 'sp': @@ -137,7 +137,7 @@ if order: payment_term = order.payment_term_id.name payment_term = payment_term and payment_term.lower() delivery_time = order.delivery_time - + ctx.update({ "amount_whole": whole, "amount_fractional": fractional, From 2bb517d63f2e90d5f153a904c680c945537dc360 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 18:19:59 +0500 Subject: [PATCH 21/64] [ADD] company type to view --- views/res_partner_template_print.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/res_partner_template_print.xml b/views/res_partner_template_print.xml index 817a254..353b070 100644 --- a/views/res_partner_template_print.xml +++ b/views/res_partner_template_print.xml @@ -12,6 +12,7 @@ + @@ -28,6 +29,7 @@ + From 9a9ab49e24e7c42feed19764be92564fd5181d4b Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 18:36:41 +0500 Subject: [PATCH 22/64] [ADD] day, month, year --- data/fields_default.xml | 61 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 63832f6..4242117 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -17,10 +17,27 @@ partner_bank = partner.bank_ids[0] # res.partner.bank seller = self.company_id seller_bank = seller.bank_ids[0] +months = ["", + "января", "февраля", "марта", "апреля", + "мая", "июня", "июля", "августа", + "сентября", "октября", "ноября", "декабря", +] +date = self.date_conclusion_fix or self.date_conclusion or self.create_date +dd = date.day +mm = date.month +yyyy = date.year +yy = yyyy % 100 +MM = months[mm] + # ctx keys must be declared in this xml ctx = { "contract_number": self.name, - "date_conclusion": self.date_conclusion_fix or self.date_conclusion, + + "dd": dd, + "mm": mm, + "MM": MM, + "yy": yy, + "yyyy": yyyy, "seller_name": seller.name, "seller_company_form": seller.company_form, @@ -159,9 +176,33 @@ action = ctx - - Conclusion Date - date_conclusion + + Day + dd + + + + + Month + mm + + + + + Month Word + MM + + + + + Year Short + yy + + + + + Year Full + yyyy @@ -318,6 +359,12 @@ action = ctx + + Seller Email + seller_email + + + @@ -447,5 +494,11 @@ action = ctx + + Partner Email + partner_email + + + From 7c811ccf2b261b74668ad459444392af12be81a1 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 18:42:46 +0500 Subject: [PATCH 23/64] [FIX] date error --- data/fields_default.xml | 2 +- models/res_partner_contract.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 4242117..0cbac60 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -22,7 +22,7 @@ months = ["", "мая", "июня", "июля", "августа", "сентября", "октября", "ноября", "декабря", ] -date = self.date_conclusion_fix or self.date_conclusion or self.create_date +date = self.get_date() dd = date.day mm = date.month yyyy = date.year diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index b5d5f7f..c953363 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -97,6 +97,9 @@ class PartnerContract(models.Model): "context": {"self_id": self.id}, } + def get_date(self): + return self.date_conclusion_fix or self.date_conclusion_fix or self.create_date + class PrintTemplate(models.Model): _name = "res.partner.template.print" From 0c327980b37804fd3880ac20a00b3144c0cc15b7 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 18:49:18 +0500 Subject: [PATCH 24/64] [FIX] date error --- data/fields_default.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 0cbac60..10f5abf 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -22,22 +22,22 @@ months = ["", "мая", "июня", "июля", "августа", "сентября", "октября", "ноября", "декабря", ] -date = self.get_date() -dd = date.day -mm = date.month -yyyy = date.year -yy = yyyy % 100 -MM = months[mm] +#date = self.get_date() +#dd = date.day +#mm = date.month +#yyyy = date.year +#yy = yyyy % 100 +#MM = months[mm] # ctx keys must be declared in this xml ctx = { "contract_number": self.name, - "dd": dd, - "mm": mm, - "MM": MM, - "yy": yy, - "yyyy": yyyy, +# "dd": dd, +# "mm": mm, +# "MM": MM, +# "yy": yy, +# "yyyy": yyyy, "seller_name": seller.name, "seller_company_form": seller.company_form, From 1771cba477820789d386c9bf905e981ca179b01f Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 18:52:58 +0500 Subject: [PATCH 25/64] [FIX] date error --- data/fields_default.xml | 17 ++++++----------- models/res_partner_contract.py | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 10f5abf..8f14b1d 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -22,22 +22,17 @@ months = ["", "мая", "июня", "июля", "августа", "сентября", "октября", "ноября", "декабря", ] -#date = self.get_date() -#dd = date.day -#mm = date.month -#yyyy = date.year -#yy = yyyy % 100 -#MM = months[mm] +date = self.get_date_context() # ctx keys must be declared in this xml ctx = { "contract_number": self.name, -# "dd": dd, -# "mm": mm, -# "MM": MM, -# "yy": yy, -# "yyyy": yyyy, + "dd": date.get('dd'), + "mm": date.get('mm'), + "MM": date.get('MM'), + "yy": date.get('yy'), + "yyyy": date.get('yyyy'), "seller_name": seller.name, "seller_company_form": seller.company_form, diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index c953363..0291878 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -97,8 +97,20 @@ class PartnerContract(models.Model): "context": {"self_id": self.id}, } - def get_date(self): - return self.date_conclusion_fix or self.date_conclusion_fix or self.create_date + def get_date_context(self): + months = ["", + "января", "февраля", "марта", "апреля", + "мая", "июня", "июля", "августа", + "сентября", "октября", "ноября", "декабря", + ] + date = self.date_conclusion_fix or self.date_conclusion_fix or self.create_date + return { + "dd": date.day, + "mm": date.month, + "yyyy": date.year, + "yy": date.year % 100, + "MM": months[date.month], + } class PrintTemplate(models.Model): From 35f1240a9047571f931b753f9626c6ce8dd2057e Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 19:18:37 +0500 Subject: [PATCH 26/64] [FIX] date error --- data/fields_default.xml | 17 +++++++++++------ models/res_partner_contract.py | 23 +++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 8f14b1d..0cbac60 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -22,17 +22,22 @@ months = ["", "мая", "июня", "июля", "августа", "сентября", "октября", "ноября", "декабря", ] -date = self.get_date_context() +date = self.get_date() +dd = date.day +mm = date.month +yyyy = date.year +yy = yyyy % 100 +MM = months[mm] # ctx keys must be declared in this xml ctx = { "contract_number": self.name, - "dd": date.get('dd'), - "mm": date.get('mm'), - "MM": date.get('MM'), - "yy": date.get('yy'), - "yyyy": date.get('yyyy'), + "dd": dd, + "mm": mm, + "MM": MM, + "yy": yy, + "yyyy": yyyy, "seller_name": seller.name, "seller_company_form": seller.company_form, diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index 0291878..3e81368 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -1,6 +1,7 @@ import datetime from odoo import _, api, fields, models +from odoo.tools.misc import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT class PartnerContract(models.Model): @@ -97,20 +98,14 @@ class PartnerContract(models.Model): "context": {"self_id": self.id}, } - def get_date_context(self): - months = ["", - "января", "февраля", "марта", "апреля", - "мая", "июня", "июля", "августа", - "сентября", "октября", "ноября", "декабря", - ] - date = self.date_conclusion_fix or self.date_conclusion_fix or self.create_date - return { - "dd": date.day, - "mm": date.month, - "yyyy": date.year, - "yy": date.year % 100, - "MM": months[date.month], - } + def get_date(self): + date = self.date_conclusion_fix or self.date_conclusion + if date: + date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATE_FORMAT) + else: + date = self.create_date + date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT) + return date class PrintTemplate(models.Model): From ead735a255f5c22a53932747087eb00ed92efa30 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 19:27:32 +0500 Subject: [PATCH 27/64] [IMP] company form value --- data/fields_default.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 0cbac60..b552d77 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -40,7 +40,7 @@ ctx = { "yyyy": yyyy, "seller_name": seller.name, - "seller_company_form": seller.company_form, + "seller_company_form": dict(seller._fields['company_form'].selection).get(seller.company_form), "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_initials": seller.representative_id.name_initials_case, @@ -84,7 +84,7 @@ if not partner.is_company: else: # Company ctx.update({ - "partner_company_form": partner.company_form, + "partner_company_form": dict(partner._fields['company_form'].selection).get(partner.company_form), "partner_representer_name": partner.representative_id.name, "partner_representer_name_parent": partner.representative_id.name_parent_case, "partner_representer_name_initials": partner.representative_id.name_initials_case, From 7e8aba85cc454f4a0b54b4d136e0982840f3f5d2 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 19:31:47 +0500 Subject: [PATCH 28/64] [ADD] bank rs, ks --- data/fields_default.xml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index b552d77..193f27f 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -347,9 +347,15 @@ action = ctx - - Seller Bank Account - seller_bank_account + + Partner Bank Account Number + partner_rs + + + + + Partner Bank Corresponding Account Number + partner_ks @@ -482,9 +488,15 @@ action = ctx - - Partner Bank Account - partner_bank_account + + Partner Bank Account Number + partner_rs + + + + + Partner Bank Corresponding Account Number + partner_ks From 59400db391cc5179ad8c948b051cff7243e3b69a Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 19:45:44 +0500 Subject: [PATCH 29/64] [FIX] contract fields --- data/fields_default.xml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 193f27f..465ecae 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -341,21 +341,27 @@ action = ctx + + Seller PSRN-IP + seller_ogrnip + + + Seller Bank Name seller_bank - - Partner Bank Account Number - partner_rs + + Seller Bank Account Number + seller_rs - - Partner Bank Corresponding Account Number - partner_ks + + Seller Bank Corresponding Account Number + seller_ks @@ -482,6 +488,13 @@ action = ctx + + Partner PSRN-IP + partner_ogrnip + + + + Partner Bank Name partner_bank From f13466894dc4afa6cace9539a8558bad7d80c94d Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 19:50:21 +0500 Subject: [PATCH 30/64] [FIX] required for template --- wizard/res_partner_contract_wizard.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/wizard/res_partner_contract_wizard.py b/wizard/res_partner_contract_wizard.py index 3ecfc9a..218a4a8 100644 --- a/wizard/res_partner_contract_wizard.py +++ b/wizard/res_partner_contract_wizard.py @@ -29,12 +29,10 @@ class ContractWizard(models.TransientModel): print_template_contract = fields.Many2one( "res.partner.template.print.contract", string="Print Template of Contract", - required=True, ) print_template_annex = fields.Many2one( "res.partner.template.print.annex", string="Print Template of Contract Annex", - required=True, ) transient_field_ids = fields.One2many( From 04b9f29f43846d3a77f0bcec686184a229bc4bc3 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 19:54:14 +0500 Subject: [PATCH 31/64] [FIX] representative document --- data/fields_default.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 465ecae..524b333 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -44,7 +44,7 @@ ctx = { "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_initials": seller.representative_id.name_initials_case, - "seller_representer_document_parent": seller.representative_id.representative_document, + "seller_representer_document_parent": seller.representative_document, "seller_inn": seller.vat, "seller_kpp": seller.iec, "seller_ogrn": seller.psrn, @@ -88,7 +88,7 @@ else: "partner_representer_name": partner.representative_id.name, "partner_representer_name_parent": partner.representative_id.name_parent_case, "partner_representer_name_initials": partner.representative_id.name_initials_case, - "partner_representer_document_parent": partner.representative_id.representative_document, + "partner_representer_document_parent": partner.representative_document, }) if partner.company_form == 'sp': From daed8d7675690ede92a4203d8a5064c511956c2b Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 19:58:11 +0500 Subject: [PATCH 32/64] [ADD] passport to sp --- data/fields_default.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/fields_default.xml b/data/fields_default.xml index 524b333..59b7d42 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -97,6 +97,9 @@ else: "partner_ip_number": partner.sp_register_number, "partner_ip_date": partner.sp_register_date, "partner_ogrnip": partner.psrn_sp, + "partner_passport_number": partner.representative_id.passport_number, + "partner_passport_date": partner.representative_id.passport_date, + "partner_passport_department": partner.representative_id.passport_department, }) if partner.company_form == 'plc': # Private Limited Company From f171ccc17daad3490bec2d6809d253dcf7fb4597 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 20:01:21 +0500 Subject: [PATCH 33/64] [FIX] passport --- data/fields_default.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 59b7d42..5fd7bd1 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -77,9 +77,9 @@ if seller_bank: if not partner.is_company: ctx.update({ "partner_name_initials": partner.name_initials_case, # TODO: remove 'case' - "partner_passport_number": partner.passport_number, - "partner_passport_date": partner.passport_date, - "partner_passport_department": partner.passport_department, + "partner_representer_passport_number": partner.passport_number, + "partner_representer_passport_date": partner.passport_date, + "partner_representer_passport_department": partner.passport_department, }) else: # Company @@ -97,9 +97,9 @@ else: "partner_ip_number": partner.sp_register_number, "partner_ip_date": partner.sp_register_date, "partner_ogrnip": partner.psrn_sp, - "partner_passport_number": partner.representative_id.passport_number, - "partner_passport_date": partner.representative_id.passport_date, - "partner_passport_department": partner.representative_id.passport_department, + "partner_representer_passport_number": partner.representative_id.passport_number, + "partner_representer_passport_date": partner.representative_id.passport_date, + "partner_representer_passport_department": partner.representative_id.passport_department, }) if partner.company_form == 'plc': # Private Limited Company From 6e80e47b04002ffe933fbde34c600df059f20a1c Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Fri, 27 Dec 2019 20:20:42 +0500 Subject: [PATCH 34/64] [i18n] update --- i18n/ru.po | 269 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 241 insertions(+), 28 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index 1db272c..73577a6 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0-20191106\n" +"Project-Id-Version: Odoo Server 11.0-20190816\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-25 11:27+0000\n" -"PO-Revision-Date: 2019-12-25 11:27+0000\n" +"POT-Creation-Date: 2019-12-27 15:10+0000\n" +"PO-Revision-Date: 2019-12-27 15:10+0000\n" "Last-Translator: Stepan Savelyev\n" "Language-Team: RYDLAB\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgid "Amount Whole Part" msgstr "Целая часть суммы" #. module: client_contracts -#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:145 +#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:138 #: model:ir.ui.menu,name:client_contracts.res_partner_menu_contracts_templates_annex #, python-format msgid "Annex" @@ -85,9 +85,11 @@ msgid "Annexes to this contract" msgstr "Приложения к договору" #. module: client_contracts -#: model:ir.ui.view,arch_db:client_contracts.res_partner_contract_info_inherit_view -msgid "Banks" -msgstr "Банки" +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_name +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_name +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_name +msgid "Attachment Name" +msgstr "Название вложения" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_signature @@ -110,9 +112,15 @@ msgstr "Закрыт" msgid "Company" msgstr "Компания" +#. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_company_type +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_company_type +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_company_type +msgid "Company Type" +msgstr "Тип компании" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_date_conclusion -#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_conclusion_date msgid "Conclusion Date" msgstr "Дата подписания" @@ -122,7 +130,7 @@ msgid "Contact" msgstr "Контакт" #. module: client_contracts -#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:142 +#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:135 #: model:ir.model,name:client_contracts.model_res_partner_contract #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_contract_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient__contract_wizard_id @@ -217,6 +225,7 @@ msgstr "Создать документ" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_create_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_create_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_create_uid +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_create_uid msgid "Created by" msgstr "Создано" @@ -228,6 +237,7 @@ msgstr "Создано" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_create_date +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_create_date msgid "Created on" msgstr "Создан" @@ -242,10 +252,9 @@ msgid "Date of system conclusion" msgstr "Дата подписания системой" #. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_is_default -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_is_default -msgid "Default Template" -msgstr "Default Template" +#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_dd +msgid "Day" +msgstr "День" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_delivery_time @@ -268,6 +277,7 @@ msgstr "Описание" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_display_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_display_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_display_name +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_display_name msgid "Display Name" msgstr "Отображаемое Имя" @@ -312,9 +322,17 @@ msgstr "Generate Context for Contract" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_id +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_id msgid "ID" msgstr "Номер" +#. module: client_contracts +#: selection:res.partner.template.print,company_type:0 +#: selection:res.partner.template.print.annex,company_type:0 +#: selection:res.partner.template.print.contract,company_type:0 +msgid "Individual" +msgstr "Физическое лицо" + #. module: client_contracts #: model:ir.ui.view,arch_db:client_contracts.res_partner_wizard_print_annex_view msgid "Info" @@ -326,6 +344,7 @@ msgstr "Информация" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field___last_update #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient___last_update #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard___last_update +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print___last_update #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex___last_update #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract___last_update msgid "Last Modified on" @@ -339,6 +358,7 @@ msgstr "Последнее изменение" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_write_uid +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_write_uid msgid "Last Updated by" msgstr "Последний раз обновлено" @@ -350,6 +370,7 @@ msgstr "Последний раз обновлено" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_write_date +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_write_date msgid "Last Updated on" msgstr "Последний раз обновлено" @@ -358,6 +379,16 @@ msgstr "Последний раз обновлено" msgid "Leave empty for compute" msgstr "Оставить пустым для автозаполнения..." +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_mm +msgid "Month" +msgstr "Месяц" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_mm_word +msgid "Month Word" +msgstr "Месяц (слово)" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_name @@ -393,6 +424,12 @@ msgstr "Новый" msgid "Order" msgstr "Заказ" +#. module: client_contracts +#: model:ir.model.fields,help:client_contracts.field_res_partner_representative_document +#: model:ir.model.fields,help:client_contracts.field_res_users_representative_document +msgid "Parent Case" +msgstr "В родительном падеже" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_partner_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_partner_id @@ -406,9 +443,14 @@ msgid "Partner BIC" msgstr "БИК Партнёра" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bank_account -msgid "Partner Bank Account" -msgstr "Расчётный счёт Партнёра" +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bank_rs +msgid "Partner Bank Account Number" +msgstr "Рассчётный счёт Партнёра" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bank_ks +msgid "Partner Bank Corresponding Account Number" +msgstr "Корр. счёт Партнёра" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bank @@ -421,37 +463,67 @@ msgid "Partner Business Address" msgstr "Юридический адрёс Партнёра" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_company_name -msgid "Partner Company Name" -msgstr "Наименование компании Партнёра" +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_email +msgid "Partner Email" +msgstr "Эл. почта Партнёра" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_inn msgid "Partner INN" msgstr "ИНН Партнёра" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ip_date +msgid "Partner IP Date" +msgstr "Дата регистрации ИП Партнёра" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ip_number +msgid "Partner IP Number" +msgstr "Серия и номер регистрации ИП Партнёра" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_company_form +msgid "Partner Institutional-Legal Form" +msgstr "Организационно-правовая форма Партнёра" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_kpp msgid "Partner KPP" msgstr "КПП Партнёра" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_name +msgid "Partner Name" +msgstr "Наименование Партнёра" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_psrn msgid "Partner PSRN" msgstr "ОГРН Партнёра" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_psrn_ip +msgid "Partner PSRN-IP" +msgstr "ОГРНИП Партнёра" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_phone msgid "Partner Phone" msgstr "Телефон Партнёра" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_document +msgid "Partner Representer Document Parent" +msgstr "Документ, на основании которого действует партнёр (род.падеж)" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function msgid "Partner Representer Function" msgstr "Должность представителя Партнёра" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function_parent_case +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function_parent msgid "Partner Representer Function Parent Case" msgstr "Должность представителя Партнёра в родительном падеже" @@ -470,6 +542,45 @@ msgstr "Полное имя представителя Партнёра" msgid "Partner Representer Parent Name" msgstr "Полное имя в родительном падеже Партнёра" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_date +msgid "Partner Representer Passport Date" +msgstr "Дата выдачи паспорта Партнёра" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_department +msgid "Partner Representer Passport Department" +msgstr "Кем выдан паспорт Партнёра" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_number +msgid "Partner Representer Passport Number" +msgstr "Серия и номер паспорта Партнёра" + +#. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_passport_date +#: model:ir.model.fields,field_description:client_contracts.field_res_users_passport_date +msgid "Passport issue date" +msgstr "Паспорт выдан" + +#. module: client_contracts +#: model:ir.model.fields,help:client_contracts.field_res_partner_passport_number +#: model:ir.model.fields,help:client_contracts.field_res_users_passport_number +msgid "Passport series and number" +msgstr "Серия и номер паспорта" + +#. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_passport_number +#: model:ir.model.fields,field_description:client_contracts.field_res_users_passport_number +msgid "Passport №" +msgstr "Паспорт №" + +#. module: client_contracts +#: model:ir.model.fields,help:client_contracts.field_res_partner_passport_date +#: model:ir.model.fields,help:client_contracts.field_res_users_passport_date +msgid "Passport's date of issue" +msgstr "Дата выдачи паспорта" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_payment_term msgid "Payment Term" @@ -518,7 +629,7 @@ msgid "Print" msgstr "Печать" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract.py:91 +#: code:addons/client_contracts/models/res_partner_contract.py:92 #, python-format msgid "Print Form of Contract" msgstr "Форма печати договора" @@ -529,6 +640,11 @@ msgstr "Форма печати договора" msgid "Print Form of Contract Annex" msgstr "Форма печати приложения к договору" +#. module: client_contracts +#: model:ir.model,name:client_contracts.model_res_partner_template_print +msgid "Print Template" +msgstr "Шаблон печати" + #. module: client_contracts #: model:ir.model,name:client_contracts.model_res_partner_template_print_contract msgid "Print Template Contract" @@ -549,6 +665,13 @@ msgstr "Шаблон-Вложение договора" msgid "Print Template of Contract Annex" msgstr "Шаблон-Вложение приложения к договору" +#. module: client_contracts +#: selection:res.partner.template.print,company_type:0 +#: selection:res.partner.template.print.annex,company_type:0 +#: selection:res.partner.template.print.contract,company_type:0 +msgid "Private Limited Company" +msgstr "Общество с ограниченной ответственностью" + #. module: client_contracts #: model:ir.model,name:client_contracts.model_sale_order msgid "Quotation" @@ -565,6 +688,12 @@ msgstr "Возобновлено" msgid "Representative" msgstr "Представитель" +#. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_representative_document +#: model:ir.model.fields,field_description:client_contracts.field_res_users_representative_document +msgid "Representative acts on the basis of" +msgstr "Представитель действует на основании" + #. module: client_contracts #: model:ir.ui.view,arch_db:client_contracts.res_partner_wizard_print_contract_view msgid "Requisites" @@ -586,9 +715,14 @@ msgid "Seller BIC" msgstr "БИК Продавца" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bank_account -msgid "Seller Bank Account" -msgstr "Расчётный счёт Продавца" +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bank_rs +msgid "Seller Bank Account Number" +msgstr "Рассчётный счёт Продавца" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bank_ks +msgid "Seller Bank Corresponding Account Number" +msgstr "Корр. счёт Продавца" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bank @@ -601,37 +735,67 @@ msgid "Seller Business Address" msgstr "Юридический адрес Продавца" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_company_name -msgid "Seller Company Name" -msgstr "Наименование компании Продавца" +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_email +msgid "Seller Email" +msgstr "Эл. почта Продавца" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_inn msgid "Seller INN" msgstr "ИНН Продавца" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ip_date +msgid "Seller IP Date" +msgstr "Дата регистрации ИП Продавца" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ip_number +msgid "Seller IP Number" +msgstr "Серия и номер регистрации ИП Продавца" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_company_form +msgid "Seller Institutional-Legal Form" +msgstr "Организационно-правовая форма Продавца" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_kpp msgid "Seller KPP" msgstr "КПП Продавца" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_name +msgid "Seller Name" +msgstr "Наименование продавца" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_psrn msgid "Seller PSRN" msgstr "ОГРН Продавца" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_psrn_ip +msgid "Seller PSRN-IP" +msgstr "ОГРНИП Продавца" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_phone msgid "Seller Phone" msgstr "Телефон Продавца" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_document +msgid "Seller Representer Document Parent" +msgstr "Документ, на основании которого действует представитель Продавца" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function msgid "Seller Representer Function" msgstr "Должность представителя Продавца" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function_parent_case +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function_parent msgid "Seller Representer Function Parent Case" msgstr "Должность представителя Продавца в родительном падеже" @@ -650,6 +814,21 @@ msgstr "Полное имя представителя Продавца" msgid "Seller Representer Parent Name" msgstr "Полное имя в родительном падеже Продавца" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_date +msgid "Seller Representer Passport Date" +msgstr "Дата выдачи паспорта представителя Продавца" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_department +msgid "Seller Representer Passport Department" +msgstr "Департамент, выдавший паспорт представителя Продавца" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_number +msgid "Seller Representer Passport Number" +msgstr "Номер паспорта представителя Продавца" + #. module: client_contracts #: model:ir.ui.view,arch_db:client_contracts.res_partner_contract_form msgid "Sign" @@ -660,6 +839,13 @@ msgstr "Подписано" msgid "Signed" msgstr "Подписан" +#. module: client_contracts +#: selection:res.partner.template.print,company_type:0 +#: selection:res.partner.template.print.annex,company_type:0 +#: selection:res.partner.template.print.contract,company_type:0 +msgid "Sole Proprietor" +msgstr "Индивидуальный предприниматель" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_state msgid "Status" @@ -676,12 +862,29 @@ msgstr "Ссылка" msgid "Technical Name" msgstr "Техническое название" +#. module: client_contracts +#: model:ir.ui.view,arch_db:client_contracts.res_partner_wizard_print_annex_view +#: model:ir.ui.view,arch_db:client_contracts.res_partner_wizard_print_contract_view +msgid "Template" +msgstr "Шаблон" + +#. module: client_contracts +#: model:ir.ui.view,arch_db:client_contracts.res_partner_template_print_annex_view_form +msgid "Template Annex" +msgstr "Шаблон приложения" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_attachment_id +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_attachment_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_attachment_id msgid "Template Attachment" msgstr "Вложение-шаблон" +#. module: client_contracts +#: model:ir.ui.view,arch_db:client_contracts.res_partner_template_print_contract_view_form +msgid "Template Contract" +msgstr "Шаблон договора" + #. module: client_contracts #: model:ir.ui.menu,name:client_contracts.res_partner_menu_contracts_templates msgid "Templates" @@ -697,6 +900,16 @@ msgstr "Номер приложения" msgid "Value" msgstr "Значение" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_yyyy +msgid "Year Full" +msgstr "Год" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_yy +msgid "Year Short" +msgstr "Сокращённый Год" + #. module: client_contracts #: model:ir.model,name:client_contracts.model_res_partner_contract_annex_line msgid "res.partner.contract.annex.line" From c2a147693f3290532ec517175093e7a717b79809 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 10:56:43 +0500 Subject: [PATCH 35/64] [STYLE] black --- models/res_partner_contract.py | 6 +++--- wizard/res_partner_contract_wizard.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index 3e81368..ab4bcce 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -118,9 +118,9 @@ class PrintTemplate(models.Model): ) company_type = fields.Selection( selection=[ - ('person', 'Individual'), - ('sp', 'Sole Proprietor'), - ('plc', 'Private Limited Company'), + ("person", "Individual"), + ("sp", "Sole Proprietor"), + ("plc", "Private Limited Company"), ] ) diff --git a/wizard/res_partner_contract_wizard.py b/wizard/res_partner_contract_wizard.py index 218a4a8..433cff3 100644 --- a/wizard/res_partner_contract_wizard.py +++ b/wizard/res_partner_contract_wizard.py @@ -27,12 +27,10 @@ class ContractWizard(models.TransientModel): company_id = fields.Many2one("res.partner", string="Company") partner_id = fields.Many2one("res.partner", string="Partner") print_template_contract = fields.Many2one( - "res.partner.template.print.contract", - string="Print Template of Contract", + "res.partner.template.print.contract", string="Print Template of Contract", ) print_template_annex = fields.Many2one( - "res.partner.template.print.annex", - string="Print Template of Contract Annex", + "res.partner.template.print.annex", string="Print Template of Contract Annex", ) transient_field_ids = fields.One2many( @@ -103,11 +101,13 @@ class ContractWizard(models.TransientModel): ] # Set up template domain - company_type = self.partner_id.company_form if self.partner_id.is_company else 'person' + company_type = ( + self.partner_id.company_form if self.partner_id.is_company else "person" + ) return { - 'domain': { - 'print_template_contract': [('company_type', '=', company_type)], - 'print_template_annex': [('company_type', '=', company_type)] + "domain": { + "print_template_contract": [("company_type", "=", company_type)], + "print_template_annex": [("company_type", "=", company_type)], } } From 146fa6fb3bb330c31a81691a21a86e335d70517e Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 10:59:09 +0500 Subject: [PATCH 36/64] [i18n] update --- i18n/ru.po | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index 73577a6..89adece 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -47,6 +47,11 @@ msgstr "Оплата в 3 этапа" msgid "Actual Address" msgstr "Актуальный адрес" +#. module: client_contracts +#: model:ir.model.fields,help:client_contracts.field_res_users_okpo +msgid "All-Russian Classifier of Enterprises and Organizations" +msgstr "Общероссийский классификатор предприятий и организаций" + #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_amount_fractional msgid "Amount Fractional Part" @@ -219,7 +224,6 @@ msgstr "Создать документ" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_create_uid -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_create_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_create_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_create_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_create_uid @@ -231,7 +235,6 @@ msgstr "Создано" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_create_date -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_create_date @@ -244,12 +247,12 @@ msgstr "Создан" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_date_conclusion_fix msgid "Date of manual conclusion" -msgstr "Дата подписания" +msgstr "Date of manual conclusion" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_date_conclusion msgid "Date of system conclusion" -msgstr "Дата подписания системой" +msgstr "Date of system conclusion" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_dd @@ -318,7 +321,6 @@ msgstr "Generate Context for Contract" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_id -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_id @@ -355,7 +357,6 @@ msgstr "Последнее изменение" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_write_uid -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_write_uid #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_write_uid @@ -367,7 +368,6 @@ msgstr "Последний раз обновлено" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_write_date -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_write_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_write_date @@ -419,6 +419,11 @@ msgstr "Имя поля, используемое в шаблоне" msgid "New" msgstr "Новый" +#. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_users_okpo +msgid "OKPO" +msgstr "ОКПО" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_order_id msgid "Order" @@ -557,30 +562,6 @@ msgstr "Кем выдан паспорт Партнёра" msgid "Partner Representer Passport Number" msgstr "Серия и номер паспорта Партнёра" -#. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_passport_date -#: model:ir.model.fields,field_description:client_contracts.field_res_users_passport_date -msgid "Passport issue date" -msgstr "Паспорт выдан" - -#. module: client_contracts -#: model:ir.model.fields,help:client_contracts.field_res_partner_passport_number -#: model:ir.model.fields,help:client_contracts.field_res_users_passport_number -msgid "Passport series and number" -msgstr "Серия и номер паспорта" - -#. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_passport_number -#: model:ir.model.fields,field_description:client_contracts.field_res_users_passport_number -msgid "Passport №" -msgstr "Паспорт №" - -#. module: client_contracts -#: model:ir.model.fields,help:client_contracts.field_res_partner_passport_date -#: model:ir.model.fields,help:client_contracts.field_res_users_passport_date -msgid "Passport's date of issue" -msgstr "Дата выдачи паспорта" - #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_payment_term msgid "Payment Term" From 894ebfe6d818501f1bb8a73b8cdfe561bfd46145 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 11:04:25 +0500 Subject: [PATCH 37/64] [FIX] no translate of company form in printed template --- data/fields_default.xml | 4 ++-- models/res_partner_contract.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 5fd7bd1..32562a3 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -40,7 +40,7 @@ ctx = { "yyyy": yyyy, "seller_name": seller.name, - "seller_company_form": dict(seller._fields['company_form'].selection).get(seller.company_form), + "seller_company_form": self._(dict(seller._fields['company_form'].selection).get(seller.company_form)), "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_initials": seller.representative_id.name_initials_case, @@ -84,7 +84,7 @@ if not partner.is_company: else: # Company ctx.update({ - "partner_company_form": dict(partner._fields['company_form'].selection).get(partner.company_form), + "partner_company_form": self._(dict(partner._fields['company_form'].selection).get(partner.company_form)), "partner_representer_name": partner.representative_id.name, "partner_representer_name_parent": partner.representative_id.name_parent_case, "partner_representer_name_initials": partner.representative_id.name_initials_case, diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index ab4bcce..a087932 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -99,6 +99,11 @@ class PartnerContract(models.Model): } def get_date(self): + """Uses in xml action (data/fields_default) + + Returns: + datetime.datetime -- date_conclusion_fix or date_conclusion or create_date + """ date = self.date_conclusion_fix or self.date_conclusion if date: date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATE_FORMAT) @@ -107,6 +112,14 @@ class PartnerContract(models.Model): date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT) return date + def _(self, arg): + """Uses in xml action (data/fields_default) + + Arguments: + arg {str} -- String to translate + """ + return _(arg) + class PrintTemplate(models.Model): _name = "res.partner.template.print" From 762e0767b1449f59a1b2b865bcac7435be00c06b Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 11:24:50 +0500 Subject: [PATCH 38/64] [FIX] representer name initials --- data/fields_default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 32562a3..813bcff 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -76,7 +76,7 @@ if seller_bank: # Person if not partner.is_company: ctx.update({ - "partner_name_initials": partner.name_initials_case, # TODO: remove 'case' + "partner_representer_name_initials": partner.name_initials_case, # TODO: remove 'case' "partner_representer_passport_number": partner.passport_number, "partner_representer_passport_date": partner.passport_date, "partner_representer_passport_department": partner.passport_department, From 7587f2abb597ed9f293999401a3a92ce851cf38b Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 12:07:50 +0500 Subject: [PATCH 39/64] [ADD] annex fields --- data/fields_default.xml | 109 +++++++++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 24 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 813bcff..d38273a 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -124,47 +124,108 @@ action = ctx # Aliases self = record -order = self.order_id + seller = self.contract_id.company_id partner = self.contract_id.partner_id +seller_bank = seller.bank_ids[0] +partner_bank = partner.bank_ids[0] + # Functions -modf = self.modf +_ = self.contract_id._ +get_date = self.contract_id.get_date + +# Parse date +months = ["", + "января", "февраля", "марта", "апреля", + "мая", "июня", "июля", "августа", + "сентября", "октября", "ноября", "декабря", +] +date = get_date() +dd = date.day +mm = date.month +yyyy = date.year +yy = yyyy % 100 +MM = months[mm] # ctx keys must be decalared in this xml ctx = { "contract_number": self.contract_id.name, - "amount_whole": 0, - "amount_fractional": 0, + "dd": dd, + "mm": mm, + "MM": MM, + "yy": yy, + "yyyy": yyyy, - "payment_term": False, - "delivery_time": False, - - "seller_company_name": seller.name, + "seller_name": seller.name, + "seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.company_form)), "seller_representer_name": seller.representative_id.name, - "seller_representer_function": seller.representative_id.function, + "seller_representer_name_parent": seller.representative_id.name_parent_case, + "seller_representer_name_initials": seller.representative_id.name_initials_case, - "partner_company_name": partner.name, + "seller_inn": seller.vat, + "seller_kpp": seller.iec, + "seller_ogrn": seller.psrn, + "seller_business_address": seller.full_address, + "seller_phone": seller.phone, + "seller_email": seller.email, + + "partner_name": partner.name, "partner_representer_name": partner.representative_id.name, - "partner_representer_function": partner.representative_id.function, + "partner_representer_name_initials": partner.representative_id.name_initials_case, # TODO: remove 'case' + "partner_inn": partner.vat, + "partner_business_address": partner.full_address, + "partner_phone": partner.phone, + "partner_email": partner.email, } -if order: - amount = modf(order.amount_total) - fractional, whole = amount - - payment_term = order.payment_term_id.name - payment_term = payment_term and payment_term.lower() - delivery_time = order.delivery_time - +if partner_bank: ctx.update({ - "amount_whole": whole, - "amount_fractional": fractional, - - "payment_term": payment_term, - "delivery_time": delivery_time, + "partner_rs": partner_bank.acc_number, + "partner_ks": partner_bank.bank_id.corr_account, + "partner_bic": partner_bank.bank_id.bic, }) +if seller_bank: + ctx.update({ + "seller_rs": seller_bank.acc_number, + "seller_ks": seller_bank.bank_id.corr_account, + "seller_bic": seller_bank.bank_id.bic, + }) + + +# Person +if not partner.is_company: + ctx.update({ + "partner_representer_name_initials": partner.name_initials_case, # TODO: remove 'case' + "partner_representer_passport_number": partner.passport_number, + "partner_representer_passport_date": partner.passport_date, + "partner_representer_passport_department": partner.passport_department, + }) +else: + # Company + ctx.update({ + "partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.company_form)), + "partner_representer_name_parent": partner.representative_id.name_parent_case, + "partner_representer_document_parent": partner.representative_document, + }) + + if partner.company_form == 'sp': + # Sole Proprietor + ctx.update({ + "partner_ip_number": partner.sp_register_number, + "partner_ip_date": partner.sp_register_date, + "partner_ogrnip": partner.psrn_sp, + "partner_representer_passport_number": partner.representative_id.passport_number, + "partner_representer_passport_date": partner.representative_id.passport_date, + "partner_representer_passport_department": partner.representative_id.passport_department, + }) + if partner.company_form == 'plc': + # Private Limited Company + ctx.update({ + "partner_kpp": partner.iec, + "partner_ogrn": partner.psrn, + }) action = ctx From 4ed4147bd0cf03e65ac44cf0a482c82b25f67d47 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 12:09:18 +0500 Subject: [PATCH 40/64] [IMP] annex fields --- data/fields_default.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index d38273a..6f46e9c 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -12,17 +12,24 @@ # Aliases self = record + partner = self.partner_id # res.partner partner_bank = partner.bank_ids[0] # res.partner.bank + seller = self.company_id seller_bank = seller.bank_ids[0] +# Functions +_ = self._ +get_date = self.get_date + +# Parse date months = ["", "января", "февраля", "марта", "апреля", "мая", "июня", "июля", "августа", "сентября", "октября", "ноября", "декабря", ] -date = self.get_date() +date = get_date() dd = date.day mm = date.month yyyy = date.year @@ -40,7 +47,7 @@ ctx = { "yyyy": yyyy, "seller_name": seller.name, - "seller_company_form": self._(dict(seller._fields['company_form'].selection).get(seller.company_form)), + "seller_company_form": _(dict(seller._fields['company_form'].selection).get(seller.company_form)), "seller_representer_name": seller.representative_id.name, "seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_initials": seller.representative_id.name_initials_case, @@ -84,7 +91,7 @@ if not partner.is_company: else: # Company ctx.update({ - "partner_company_form": self._(dict(partner._fields['company_form'].selection).get(partner.company_form)), + "partner_company_form": _(dict(partner._fields['company_form'].selection).get(partner.company_form)), "partner_representer_name": partner.representative_id.name, "partner_representer_name_parent": partner.representative_id.name_parent_case, "partner_representer_name_initials": partner.representative_id.name_initials_case, From 4fb7bddcb39e87475dd94eb252e5fe5ffc3466d3 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 12:13:24 +0500 Subject: [PATCH 41/64] [FIX] banks index out of range --- data/fields_default.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 6f46e9c..3df8ef2 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -14,10 +14,10 @@ self = record partner = self.partner_id # res.partner -partner_bank = partner.bank_ids[0] # res.partner.bank +partner_bank = partner.bank_ids and partner.bank_ids[0] # res.partner.bank seller = self.company_id -seller_bank = seller.bank_ids[0] +seller_bank = seller.bank_ids and seller.bank_ids[0] # Functions _ = self._ @@ -135,8 +135,8 @@ self = record seller = self.contract_id.company_id partner = self.contract_id.partner_id -seller_bank = seller.bank_ids[0] -partner_bank = partner.bank_ids[0] +seller_bank = seller.bank_ids and seller.bank_ids[0] +partner_bank = partner.bank_ids and partner.bank_ids[0] # Functions _ = self.contract_id._ From d0855ecea42d05488a3bd8d68c23c3ba0eed75a6 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 12:18:19 +0500 Subject: [PATCH 42/64] [i18n] update --- i18n/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index 89adece..4550e10 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -247,12 +247,12 @@ msgstr "Создан" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_date_conclusion_fix msgid "Date of manual conclusion" -msgstr "Date of manual conclusion" +msgstr "Дата подписания" #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_date_conclusion msgid "Date of system conclusion" -msgstr "Date of system conclusion" +msgstr "Дата подписания в системе" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_dd From 0f965e4b93511b3a1af70e191e5f71cc9798d769 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 12:33:23 +0500 Subject: [PATCH 43/64] [i18n] create_date --- i18n/ru.po | 6 ++++-- models/res_partner_contract.py | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index 4550e10..4c94094 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0-20190816\n" +"Project-Id-Version: Odoo Server 11.0-20191106\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-27 15:10+0000\n" "PO-Revision-Date: 2019-12-27 15:10+0000\n" @@ -234,6 +234,7 @@ msgid "Created by" msgstr "Создано" #. module: client_contracts +#: code:addons/client_contracts/models/res_partner_contract.py:38 #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_create_date @@ -241,6 +242,7 @@ msgstr "Создано" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_annex_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_contract_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_template_print_create_date +#, python-format msgid "Created on" msgstr "Создан" @@ -610,7 +612,7 @@ msgid "Print" msgstr "Печать" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract.py:92 +#: code:addons/client_contracts/models/res_partner_contract.py:93 #, python-format msgid "Print Form of Contract" msgstr "Форма печати договора" diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index a087932..45cf9fb 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -35,6 +35,7 @@ class PartnerContract(models.Model): return datetime.datetime.now().timestamp() name = fields.Char(string="Contract number", default=_get_default_name,) + create_date = fields.Datetime(string=_("Created on")) create_date_ts = fields.Char(default=_get_default_create_date_ts) date_conclusion = fields.Date(string="Date of system conclusion",) date_conclusion_fix = fields.Date( From 150227a0a4fe5692f796514167845ba603f0982f Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 13:11:27 +0500 Subject: [PATCH 44/64] [IMP] type error --- i18n/ru.po | 4 ++-- models/res_partner_contract_annex.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index 4c94094..29cc869 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -601,8 +601,8 @@ msgid "Person, who represents company" msgstr "Представитель компании" #. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_prepaid_expence -msgid "Prepaid Expence" +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_prepaid_expense +msgid "Prepaid Expense" msgstr "Аванс" #. module: client_contracts diff --git a/models/res_partner_contract_annex.py b/models/res_partner_contract_annex.py index 4fd0dc7..0d6e688 100644 --- a/models/res_partner_contract_annex.py +++ b/models/res_partner_contract_annex.py @@ -15,7 +15,7 @@ class ContractOrderAnnex(models.Model): date_conclusion = fields.Date( string="Conclusion Date", default=fields.Date.today(), ) - prepaid_expence = fields.Float(string="Prepaid Expence", default=0) + prepaid_expense = fields.Float(string="Prepaid Expense", default=0) delivery_time = fields.Integer(related="order_id.delivery_time", readonly=True,) payment_term = fields.Many2one( "account.payment.term", related="order_id.payment_term_id", readonly=True, From 6b8e5883cb2adb030a2503a3b0bec48f2edaee70 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 14:15:12 +0500 Subject: [PATCH 45/64] [IMP] use MODULE_NAME --- models/res_partner_contract.py | 4 +++- models/res_partner_contract_annex.py | 4 +++- models/sale_order.py | 10 ++++++---- utils/__init__.py | 1 + wizard/res_partner_contract_wizard.py | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py index 45cf9fb..2967c48 100644 --- a/models/res_partner_contract.py +++ b/models/res_partner_contract.py @@ -3,6 +3,8 @@ import datetime from odoo import _, api, fields, models from odoo.tools.misc import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT +from ..utils import MODULE_NAME + class PartnerContract(models.Model): _name = "res.partner.contract" @@ -88,7 +90,7 @@ class PartnerContract(models.Model): @api.multi def action_print_form(self): - view = self.env.ref("client_contracts.res_partner_wizard_print_contract_view") + view = self.env.ref("{}.res_partner_wizard_print_contract_view".format(MODULE_NAME)) return { "name": _("Print Form of Contract"), "type": "ir.actions.act_window", diff --git a/models/res_partner_contract_annex.py b/models/res_partner_contract_annex.py index 0d6e688..6aa8b38 100644 --- a/models/res_partner_contract_annex.py +++ b/models/res_partner_contract_annex.py @@ -2,6 +2,8 @@ import math from odoo import _, api, fields, models +from ..utils import MODULE_NAME + class ContractOrderAnnex(models.Model): _name = "res.partner.contract.annex" @@ -56,7 +58,7 @@ class ContractOrderAnnex(models.Model): @api.multi def action_print_form(self): - view = self.env.ref("client_contracts.res_partner_wizard_print_annex_view") + view = self.env.ref("{}.res_partner_wizard_print_annex_view".format(MODULE_NAME)) return { "name": _("Print Form of Contract Annex"), "type": "ir.actions.act_window", diff --git a/models/sale_order.py b/models/sale_order.py index ecee665..1b142bc 100644 --- a/models/sale_order.py +++ b/models/sale_order.py @@ -1,5 +1,7 @@ from odoo import api, fields, models +from ..utils import MODULE_NAME + class SaleOrder(models.Model): _inherit = "sale.order" @@ -18,9 +20,9 @@ class SaleOrder(models.Model): def _get_payment_terms(self): ref = self.env.ref terms = ( - ref("client_contracts.payment_term_prepaid").id, - ref("client_contracts.payment_term_postpayment").id, - ref("client_contracts.payment_term_partial_2").id, - ref("client_contracts.payment_term_partial_3").id, + ref("{}.payment_term_prepaid".format(MODULE_NAME)).id, + ref("{}.payment_term_postpayment".format(MODULE_NAME)).id, + ref("{}.payment_term_partial_2".format(MODULE_NAME)).id, + ref("{}.payment_term_partial_3".format(MODULE_NAME)).id, ) return terms diff --git a/utils/__init__.py b/utils/__init__.py index e69de29..5b306d3 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -0,0 +1 @@ +MODULE_NAME = __package__.split('.')[-2] diff --git a/wizard/res_partner_contract_wizard.py b/wizard/res_partner_contract_wizard.py index 433cff3..8a13140 100644 --- a/wizard/res_partner_contract_wizard.py +++ b/wizard/res_partner_contract_wizard.py @@ -76,8 +76,8 @@ class ContractWizard(models.TransientModel): self.partner_id = partner_id model_to_action = { - "res.partner.contract": "client_contracts.action_get_contract_context", - "res.partner.contract.annex": "client_contracts.action_get_annex_context", + "res.partner.contract": "{}.action_get_contract_context".format(MODULE_NAME), + "res.partner.contract.annex": "{}.action_get_annex_context".format(MODULE_NAME), } action = model_to_action[active_model] From eab1d3b77a84e69158254bc6c37ab52724e7f8c3 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:09:32 +0500 Subject: [PATCH 46/64] [ADD] field sequence --- models/res_partner_contract_field.py | 1 + wizard/res_partner_contract_wizard.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/models/res_partner_contract_field.py b/models/res_partner_contract_field.py index 7a8dbcc..d251f24 100644 --- a/models/res_partner_contract_field.py +++ b/models/res_partner_contract_field.py @@ -10,3 +10,4 @@ class ContractField(models.Model): string="Technical Name", help="Name uses in template", required=True, ) description = fields.Char(string="Description", translate=True, default="",) + sequence = fields.Integer(string="Sequence",) diff --git a/wizard/res_partner_contract_wizard.py b/wizard/res_partner_contract_wizard.py index 8a13140..65e0d14 100644 --- a/wizard/res_partner_contract_wizard.py +++ b/wizard/res_partner_contract_wizard.py @@ -5,6 +5,7 @@ import logging from odoo import _, api, fields, models from odoo.exceptions import UserError +from ..utils import MODULE_NAME from ..utils.docxtpl import get_document_from_values_stream _logger = logging.getLogger(__name__) @@ -97,7 +98,7 @@ class ContractWizard(models.TransientModel): .id, 0, ) - for field, value in sorted(contract_context_values.items()) + for field, value in sorted(contract_context_values.items(), key=lambda tpl: self.env.ref("{}.contract_field_{}".format(MODULE_NAME, tpl[0])).sequence) ] # Set up template domain From 4b8c16d0156581e342ec41a8fa716adbb122999e Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:10:08 +0500 Subject: [PATCH 47/64] [UPD] field sequence, description, external_id --- data/fields_default.xml | 511 +++++++++++++++++++++++----------------- 1 file changed, 289 insertions(+), 222 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 3df8ef2..4c69522 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -36,7 +36,7 @@ yyyy = date.year yy = yyyy % 100 MM = months[mm] -# ctx keys must be declared in this xml +# ctx keys must be decalared in this xml with id equal to "contract_field_{technical_name}" ctx = { "contract_number": self.name, @@ -155,7 +155,7 @@ yyyy = date.year yy = yyyy % 100 MM = months[mm] -# ctx keys must be decalared in this xml +# ctx keys must be decalared in this xml with id equal to "contract_field_{technical_name}" ctx = { "contract_number": self.contract_id.name, @@ -245,36 +245,42 @@ action = ctx Contract Number contract_number + 1 - + Day dd - + Number + 8 - + Month mm - + Number + 16 - - Month Word + + Month MM - + Word + 24 - - Year Short + + Year yy - + Short + 40 - - Year Full + + Year yyyy - + Full + 32 @@ -305,295 +311,356 @@ action = ctx - Seller Name + Name seller_name - + Seller + 48 - Seller Institutional-Legal Form + Institutional-Legal Form seller_company_form - - - - - Seller Business Address - seller_business_address - - - - - Seller Representer Name - seller_representer_name - - - - - Seller Representer Parent Name - seller_representer_name_parent - - - - - Seller Representer Initials Name - seller_representer_name_initials - - - - - Seller Representer Document Parent - seller_representer_document_parent - - - - - Seller Representer Function - seller_representer_function - - - - - Seller Representer Function Parent Case - seller_representer_function_parent - - - - - Seller Representer Passport Number - seller_representer_passport_number - - - - - Seller Representer Passport Date - seller_representer_passport_date - - - - - Seller Representer Passport Department - seller_representer_passport_department - + Seller + 56 - Seller IP Number + IP Number seller_ip_number - + Seller IP Certificate + 64 - Seller IP Date + IP Date seller_ip_date - + Seller IP Certificate + 72 + + + + Name + seller_representer_name + Seller Representative + 80 + + + + Name Genitive + seller_representer_name_parent + Seller Representative + 88 + + + + Name Initials + seller_representer_name_initials + Seller Representative + 96 + + + + Function + seller_representer_function + Seller Representative + 104 + + + + Function Genitive + seller_representer_function_parent + Seller Representative + 112 + + + + Document Genitive + seller_representer_document_parent + Seller Representative + 120 + + + + Passport № + seller_representer_passport_number + Seller Representative + 128 + + + + Passport Issued on + seller_representer_passport_date + Seller Representative + 136 + + + + Passport Issued by + seller_representer_passport_department + Seller Representative + 144 - Seller INN + INN seller_inn - + Seller + 152 + + + + PSRN + seller_ogrn + Seller + 160 + + + + PSRN-IP + seller_ogrnip + Seller + 168 - Seller KPP + KPP seller_kpp - + Seller + 176 - - Seller BIC - seller_bic - - - - - Seller PSRN - seller_ogrn - - - - - Seller PSRN-IP - seller_ogrnip - + + OKPO + seller_okpo + Seller + 184 - Seller Bank Name + Bank Name seller_bank - + Seller + 192 - - Seller Bank Account Number + + Bank Payment Account seller_rs - + Seller + 200 - - Seller Bank Corresponding Account Number + + Bank Corresponding Account seller_ks - + Seller + 208 + + + + BIC + seller_bic + Seller + 216 + + + + Business Address + seller_business_address + Seller + 224 - Seller Phone + Phone seller_phone - + Seller + 232 - Seller Email + Email seller_email - + Seller + 240 - Partner Name + Name partner_name - + Partner + 248 - Partner Institutional-Legal Form + Institutional-Legal Form partner_company_form - - - - - Partner Business Address - partner_business_address - - - - - Partner Representer Name - partner_representer_name - - - - - Partner Representer Parent Name - partner_representer_name_parent - - - - - Partner Representer Initials Name - partner_representer_name_initials - - - - - Partner Representer Document Parent - partner_representer_document_parent - - - - - Partner Representer Function - partner_representer_function - - - - - Partner Representer Function Parent Case - partner_representer_function_parent - - - - - Partner Representer Passport Number - partner_representer_passport_number - - - - - Partner Representer Passport Date - partner_representer_passport_date - - - - - Partner Representer Passport Department - partner_representer_passport_department - + Partner + 256 - Partner IP Number + IP Number partner_ip_number - + Partner IP Certificate + 264 - Partner IP Date + IP Date partner_ip_date - + Partner IP Certificate + 272 + + + + Name + partner_representer_name + Partner Representative + 280 + + + + Parent Name + partner_representer_name_parent + Partner Representative + 288 + + + + Initials Name + partner_representer_name_initials + Partner Representative + 296 + + + + Function + partner_representer_function + Partner Representative + 304 + + + + Function Parent Case + partner_representer_function_parent + Partner Representative + 312 + + + + Document Parent + partner_representer_document_parent + Partner Representative + 320 + + + + Passport Number + partner_representer_passport_number + Partner Representative + 328 + + + + Passport Date + partner_representer_passport_date + Partner Representative + 336 + + + + Passport Department + partner_representer_passport_department + Partner Representative + 344 - Partner INN + INN partner_inn - + Partner + 352 + + + + PSRN + partner_ogrn + Partner + 360 + + + + PSRN-IP + partner_ogrnip + Partner + 368 - Partner KPP + KPP partner_kpp - + Partner + 376 + + + + OKPO + partner_okpo + Partner + 384 + + + + Bank + partner_bank + Partner + 392 + + + + Bank Account Number + partner_rs + Partner + 400 + + + + Bank Corresponding Account Number + partner_ks + Partner + 408 - Partner BIC + BIC partner_bic - + Partner + 416 - - Partner PSRN - partner_ogrn - - - - - Partner PSRN-IP - partner_ogrnip - - - - - - Partner Bank Name - partner_bank - - - - - Partner Bank Account Number - partner_rs - - - - - Partner Bank Corresponding Account Number - partner_ks - + + Business Address + partner_business_address + Partner + 424 - Partner Phone + Phone partner_phone - + Partner + 432 - Partner Email + Email partner_email - + Partner + 440 From 2b23f4f61cdec4ef022775c3f0ae2b8c72918254 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:10:22 +0500 Subject: [PATCH 48/64] [ADD] sort field by sequence --- wizard/res_partner_contract_wizard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wizard/res_partner_contract_wizard.xml b/wizard/res_partner_contract_wizard.xml index 1507c6a..8fcabe7 100644 --- a/wizard/res_partner_contract_wizard.xml +++ b/wizard/res_partner_contract_wizard.xml @@ -21,7 +21,7 @@ - + From 92cc1a10d10af466431bf8f93351a3f09dea9b09 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:13:03 +0500 Subject: [PATCH 49/64] [IMP] field naming --- data/fields_default.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 4c69522..2594753 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -622,14 +622,14 @@ action = ctx - Bank Account Number + Bank Payment Account partner_rs Partner 400 - Bank Corresponding Account Number + Bank Corresponding Account partner_ks Partner 408 From f9020e624f588151b18f7b93513a4cb2313e122d Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:16:27 +0500 Subject: [PATCH 50/64] [IMP] Parent -> Genitive --- data/fields_default.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index 2594753..fafa897 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -524,7 +524,7 @@ action = ctx - Parent Name + Name Genitive partner_representer_name_parent Partner Representative 288 @@ -545,14 +545,14 @@ action = ctx - Function Parent Case + Function Genitive partner_representer_function_parent Partner Representative 312 - Document Parent + Document Genitive partner_representer_document_parent Partner Representative 320 From 80a6fcca5c1cd7886f767ea301295e1b02111a83 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:23:40 +0500 Subject: [PATCH 51/64] [i18n] update --- i18n/ru.po | 484 +++++++++++++++++++++++++++-------------------------- 1 file changed, 243 insertions(+), 241 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index 29cc869..ed613c5 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -6,10 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0-20191106\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-27 15:10+0000\n" -"PO-Revision-Date: 2019-12-27 15:10+0000\n" -"Last-Translator: Stepan Savelyev\n" -"Language-Team: RYDLAB\n" +"POT-Creation-Date: 2019-12-28 10:17+0000\n" +"PO-Revision-Date: 2019-12-28 10:17+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -63,7 +63,7 @@ msgid "Amount Whole Part" msgstr "Целая часть суммы" #. module: client_contracts -#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:138 +#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:139 #: model:ir.ui.menu,name:client_contracts.res_partner_menu_contracts_templates_annex #, python-format msgid "Annex" @@ -96,6 +96,40 @@ msgstr "Приложения к договору" msgid "Attachment Name" msgstr "Название вложения" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bic +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bic +msgid "BIC" +msgstr "БИК" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bank +msgid "Bank" +msgstr "Банк" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ks +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ks +msgid "Bank Corresponding Account" +msgstr "Корр. счёт" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bank +msgid "Bank Name" +msgstr "Наименование банка" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_rs +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_rs +msgid "Bank Payment Account" +msgstr "Расчётный счёт" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_business_address +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_business_address +msgid "Business Address" +msgstr "Юридический адрес" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_signature msgid "Client signature" @@ -135,7 +169,7 @@ msgid "Contact" msgstr "Контакт" #. module: client_contracts -#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:135 +#: code:addons/client_contracts/wizard/res_partner_contract_wizard.py:136 #: model:ir.model,name:client_contracts.model_res_partner_contract #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_contract_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient__contract_wizard_id @@ -234,7 +268,7 @@ msgid "Created by" msgstr "Создано" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract.py:38 +#: code:addons/client_contracts/models/res_partner_contract.py:40 #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_create_date #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_create_date @@ -257,7 +291,7 @@ msgid "Date of system conclusion" msgstr "Дата подписания в системе" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_dd +#: model:res.partner.contract.field,name:client_contracts.contract_field_dd msgid "Day" msgstr "День" @@ -286,6 +320,18 @@ msgstr "Описание" msgid "Display Name" msgstr "Отображаемое Имя" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_document_parent +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_document_parent +msgid "Document Genitive" +msgstr "Документ (род.падеж)" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_email +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_email +msgid "Email" +msgstr "Эл. почта" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_contract_field_id msgid "Field" @@ -301,12 +347,29 @@ msgstr "Поле для ручного редактирования, когда msgid "Fields" msgstr "Поля" +#. module: client_contracts +#: model:res.partner.contract.field,description:client_contracts.contract_field_yyyy +msgid "Full" +msgstr "Полный" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_full_address #: model:ir.model.fields,field_description:client_contracts.field_res_users_full_address msgid "Full Address" msgstr "Полный адрес" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function +msgid "Function" +msgstr "Должность" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function_parent +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function_parent +msgid "Function Genitive" +msgstr "Должность (род.падеж)" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_function_parent_case #: model:ir.model.fields,field_description:client_contracts.field_res_users_function_parent_case @@ -330,6 +393,24 @@ msgstr "Generate Context for Contract" msgid "ID" msgstr "Номер" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_inn +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_inn +msgid "INN" +msgstr "ИНН" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ip_date +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ip_date +msgid "IP Date" +msgstr "ИП Дата регистрации" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ip_number +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ip_number +msgid "IP Number" +msgstr "ИП Серия и номер" + #. module: client_contracts #: selection:res.partner.template.print,company_type:0 #: selection:res.partner.template.print.annex,company_type:0 @@ -342,6 +423,23 @@ msgstr "Физическое лицо" msgid "Info" msgstr "Информация" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_initials +msgid "Initials Name" +msgstr "Фамилия и инициалы" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_company_form +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_company_form +msgid "Institutional-Legal Form" +msgstr "Огранизационно-правовая форма" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_kpp +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_kpp +msgid "KPP" +msgstr "КПП" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract___last_update #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex___last_update @@ -382,22 +480,33 @@ msgid "Leave empty for compute" msgstr "Оставить пустым для автозаполнения..." #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_mm +#: model:res.partner.contract.field,name:client_contracts.contract_field_MM +#: model:res.partner.contract.field,name:client_contracts.contract_field_mm msgid "Month" msgstr "Месяц" -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_mm_word -msgid "Month Word" -msgstr "Месяц (слово)" - #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_name #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_transient_name +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_name +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_name +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name msgid "Name" msgstr "Название" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_parent +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name_parent +msgid "Name Genitive" +msgstr "Имя (род.падеж)" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name_initials +msgid "Name Initials" +msgstr "Фамилия с инициалами" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_initials_case #: model:ir.model.fields,field_description:client_contracts.field_res_users_name_initials_case @@ -421,8 +530,16 @@ msgstr "Имя поля, используемое в шаблоне" msgid "New" msgstr "Новый" +#. module: client_contracts +#: model:res.partner.contract.field,description:client_contracts.contract_field_dd +#: model:res.partner.contract.field,description:client_contracts.contract_field_mm +msgid "Number" +msgstr "Число" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_users_okpo +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_okpo +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_okpo msgid "OKPO" msgstr "ОКПО" @@ -431,6 +548,18 @@ msgstr "ОКПО" msgid "Order" msgstr "Заказ" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ogrn +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ogrn +msgid "PSRN" +msgstr "ОГРН" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ogrnip +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ogrnip +msgid "PSRN-IP" +msgstr "ОГРНИП" + #. module: client_contracts #: model:ir.model.fields,help:client_contracts.field_res_partner_representative_document #: model:ir.model.fields,help:client_contracts.field_res_users_representative_document @@ -441,128 +570,71 @@ msgstr "В родительном падеже" #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_partner_id #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_wizard_partner_id #: model:ir.ui.view,arch_db:client_contracts.res_partner_wizard_print_contract_view +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_bank +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_bic +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_business_address +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_company_form +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_email +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_inn +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_kpp +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_ks +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_name +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_ogrn +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_ogrnip +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_okpo +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_phone +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_rs msgid "Partner" msgstr "Партнёр" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bic -msgid "Partner BIC" -msgstr "БИК Партнёра" +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_ip_date +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_ip_number +msgid "Partner IP Certificate" +msgstr "Партнёр; Сертификат о регистрации ИП" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bank_rs -msgid "Partner Bank Account Number" -msgstr "Рассчётный счёт Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bank_ks -msgid "Partner Bank Corresponding Account Number" -msgstr "Корр. счёт Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_bank -msgid "Partner Bank Name" -msgstr "Наименование банка Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_business_address -msgid "Partner Business Address" -msgstr "Юридический адрёс Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_email -msgid "Partner Email" -msgstr "Эл. почта Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_inn -msgid "Partner INN" -msgstr "ИНН Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ip_date -msgid "Partner IP Date" -msgstr "Дата регистрации ИП Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ip_number -msgid "Partner IP Number" -msgstr "Серия и номер регистрации ИП Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_company_form -msgid "Partner Institutional-Legal Form" -msgstr "Организационно-правовая форма Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_kpp -msgid "Partner KPP" -msgstr "КПП Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_name -msgid "Partner Name" -msgstr "Наименование Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_psrn -msgid "Partner PSRN" -msgstr "ОГРН Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_psrn_ip -msgid "Partner PSRN-IP" -msgstr "ОГРНИП Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_phone -msgid "Partner Phone" -msgstr "Телефон Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_document -msgid "Partner Representer Document Parent" -msgstr "Документ, на основании которого действует партнёр (род.падеж)" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function -msgid "Partner Representer Function" -msgstr "Должность представителя Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function_parent -msgid "Partner Representer Function Parent Case" -msgstr "Должность представителя Партнёра в родительном падеже" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_initials -msgid "Partner Representer Initials Name" -msgstr "Фамилия с инициалами представителя Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name -msgid "Partner Representer Name" -msgstr "Полное имя представителя Партнёра" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_parent -msgid "Partner Representer Parent Name" -msgstr "Полное имя в родительном падеже Партнёра" +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_document_parent +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_function +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_function_parent +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_name +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_name_initials +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_name_parent +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_passport_date +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_passport_department +#: model:res.partner.contract.field,description:client_contracts.contract_field_partner_representer_passport_number +msgid "Partner Representative" +msgstr "Представитель Партнёра" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_date -msgid "Partner Representer Passport Date" -msgstr "Дата выдачи паспорта Партнёра" +msgid "Passport Date" +msgstr "Паспорт выдан" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_department -msgid "Partner Representer Passport Department" -msgstr "Кем выдан паспорт Партнёра" +msgid "Passport Department" +msgstr "Паспорт выдан" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_department +msgid "Passport Issued by" +msgstr "Паспорт выдан" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_date +msgid "Passport Issued on" +msgstr "Паспорт выдан" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_number -msgid "Partner Representer Passport Number" -msgstr "Серия и номер паспорта Партнёра" +msgid "Passport Number" +msgstr "Серия и номер паспорта" + +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_number +msgid "Passport №" +msgstr "Паспорт №" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_payment_term @@ -600,6 +672,12 @@ msgstr "Условия оплаты: частично в 3 этапа" msgid "Person, who represents company" msgstr "Представитель компании" +#. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_phone +#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_phone +msgid "Phone" +msgstr "Телефон" + #. module: client_contracts #: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_annex_prepaid_expense msgid "Prepaid Expense" @@ -612,13 +690,13 @@ msgid "Print" msgstr "Печать" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract.py:93 +#: code:addons/client_contracts/models/res_partner_contract.py:95 #, python-format msgid "Print Form of Contract" msgstr "Форма печати договора" #. module: client_contracts -#: code:addons/client_contracts/models/res_partner_contract_annex.py:61 +#: code:addons/client_contracts/models/res_partner_contract_annex.py:63 #, python-format msgid "Print Form of Contract Annex" msgstr "Форма печати приложения к договору" @@ -689,128 +767,51 @@ msgstr "Поиск договора" #. module: client_contracts #: model:ir.ui.view,arch_db:client_contracts.res_partner_wizard_print_contract_view +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_bank +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_bic +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_business_address +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_company_form +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_email +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_inn +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_kpp +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_ks +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_name +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_ogrn +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_ogrnip +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_okpo +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_phone +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_rs msgid "Seller" msgstr "Продавец" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bic -msgid "Seller BIC" -msgstr "БИК Продавца" +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_ip_date +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_ip_number +msgid "Seller IP Certificate" +msgstr "Продавец; Сертификат о регистрации ИП" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bank_rs -msgid "Seller Bank Account Number" -msgstr "Рассчётный счёт Продавца" +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_document_parent +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_function +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_function_parent +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_name +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_name_initials +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_name_parent +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_passport_date +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_passport_department +#: model:res.partner.contract.field,description:client_contracts.contract_field_seller_representer_passport_number +msgid "Seller Representative" +msgstr "Представитель Продавца" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bank_ks -msgid "Seller Bank Corresponding Account Number" -msgstr "Корр. счёт Продавца" +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_contract_field_sequence +msgid "Sequence" +msgstr "Нумерация" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_bank -msgid "Seller Bank Name" -msgstr "Наименование банка Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_business_address -msgid "Seller Business Address" -msgstr "Юридический адрес Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_email -msgid "Seller Email" -msgstr "Эл. почта Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_inn -msgid "Seller INN" -msgstr "ИНН Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ip_date -msgid "Seller IP Date" -msgstr "Дата регистрации ИП Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ip_number -msgid "Seller IP Number" -msgstr "Серия и номер регистрации ИП Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_company_form -msgid "Seller Institutional-Legal Form" -msgstr "Организационно-правовая форма Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_kpp -msgid "Seller KPP" -msgstr "КПП Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_name -msgid "Seller Name" -msgstr "Наименование продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_psrn -msgid "Seller PSRN" -msgstr "ОГРН Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_psrn_ip -msgid "Seller PSRN-IP" -msgstr "ОГРНИП Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_phone -msgid "Seller Phone" -msgstr "Телефон Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_document -msgid "Seller Representer Document Parent" -msgstr "Документ, на основании которого действует представитель Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function -msgid "Seller Representer Function" -msgstr "Должность представителя Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function_parent -msgid "Seller Representer Function Parent Case" -msgstr "Должность представителя Продавца в родительном падеже" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name_initials -msgid "Seller Representer Initials Name" -msgstr "Фамилия с инициалами представителя Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name -msgid "Seller Representer Name" -msgstr "Полное имя представителя Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name_parent -msgid "Seller Representer Parent Name" -msgstr "Полное имя в родительном падеже Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_date -msgid "Seller Representer Passport Date" -msgstr "Дата выдачи паспорта представителя Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_department -msgid "Seller Representer Passport Department" -msgstr "Департамент, выдавший паспорт представителя Продавца" - -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_number -msgid "Seller Representer Passport Number" -msgstr "Номер паспорта представителя Продавца" +#: model:res.partner.contract.field,description:client_contracts.contract_field_yy +msgid "Short" +msgstr "Сокращенно" #. module: client_contracts #: model:ir.ui.view,arch_db:client_contracts.res_partner_contract_form @@ -884,14 +885,15 @@ msgid "Value" msgstr "Значение" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_yyyy -msgid "Year Full" -msgstr "Год" +#: model:res.partner.contract.field,description:client_contracts.contract_field_MM +msgid "Word" +msgstr "Слово" #. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_contract_date_yy -msgid "Year Short" -msgstr "Сокращённый Год" +#: model:res.partner.contract.field,name:client_contracts.contract_field_yy +#: model:res.partner.contract.field,name:client_contracts.contract_field_yyyy +msgid "Year" +msgstr "Год" #. module: client_contracts #: model:ir.model,name:client_contracts.model_res_partner_contract_annex_line From 51d34721321224d7e828349f8bf06328ba2cf4c8 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:29:11 +0500 Subject: [PATCH 52/64] [IMP] fix field names --- data/fields_default.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/fields_default.xml b/data/fields_default.xml index fafa897..b2fb87a 100644 --- a/data/fields_default.xml +++ b/data/fields_default.xml @@ -332,7 +332,7 @@ action = ctx - IP Date + IP Issued on seller_ip_date Seller IP Certificate 72 @@ -510,7 +510,7 @@ action = ctx - IP Date + IP Issued on partner_ip_date Partner IP Certificate 272 @@ -531,7 +531,7 @@ action = ctx - Initials Name + Name Initials partner_representer_name_initials Partner Representative 296 @@ -559,21 +559,21 @@ action = ctx - Passport Number + Passport № partner_representer_passport_number Partner Representative 328 - Passport Date + Passport Issued on partner_representer_passport_date Partner Representative 336 - Passport Department + Passport Issued by partner_representer_passport_department Partner Representative 344 From 00ba1fa6a95df4852444c4f0e8c7b000de74e011 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:30:45 +0500 Subject: [PATCH 53/64] [IMP] fix field names --- models/res_partner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/res_partner.py b/models/res_partner.py index 346fe1e..2ba4261 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -4,9 +4,9 @@ from odoo import api, fields, models class ResPartner(models.Model): _inherit = "res.partner" - name_parent_case = fields.Char(string="Name Parent Case",) - name_initials_case = fields.Char(string="Name Initials Case",) - function_parent_case = fields.Char(string="Function Parent Case",) + name_parent_case = fields.Char(string="Name Genitive",) + name_initials_case = fields.Char(string="Name Initials",) + function_parent_case = fields.Char(string="Function Genitive",) client_contract_ids = fields.One2many( "res.partner.contract", "partner_id", string="Contracts", ) From ea487477c1e8146249b1237c5393d7a7ec9f4f0f Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:33:26 +0500 Subject: [PATCH 54/64] [i18n] update --- i18n/ru.po | 52 ++++++++++++---------------------------------------- 1 file changed, 12 insertions(+), 40 deletions(-) diff --git a/i18n/ru.po b/i18n/ru.po index ed613c5..b48285f 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0-20191106\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-28 10:17+0000\n" -"PO-Revision-Date: 2019-12-28 10:17+0000\n" +"POT-Creation-Date: 2019-12-28 10:32+0000\n" +"PO-Revision-Date: 2019-12-28 10:32+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -365,17 +365,13 @@ msgid "Function" msgstr "Должность" #. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_function_parent_case +#: model:ir.model.fields,field_description:client_contracts.field_res_users_function_parent_case #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_function_parent #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_function_parent msgid "Function Genitive" msgstr "Должность (род.падеж)" -#. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_function_parent_case -#: model:ir.model.fields,field_description:client_contracts.field_res_users_function_parent_case -msgid "Function Parent Case" -msgstr "Должность в родительном падеже" - #. module: client_contracts #: model:ir.actions.server,name:client_contracts.action_get_annex_context #: model:ir.actions.server,name:client_contracts.action_get_contract_context @@ -402,8 +398,8 @@ msgstr "ИНН" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ip_date #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_ip_date -msgid "IP Date" -msgstr "ИП Дата регистрации" +msgid "IP Issued on" +msgstr "ИП Выдан" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_ip_number @@ -423,11 +419,6 @@ msgstr "Физическое лицо" msgid "Info" msgstr "Информация" -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_initials -msgid "Initials Name" -msgstr "Фамилия и инициалы" - #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_company_form #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_company_form @@ -497,28 +488,21 @@ msgid "Name" msgstr "Название" #. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_parent_case +#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_parent_case #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_parent #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name_parent msgid "Name Genitive" msgstr "Имя (род.падеж)" #. module: client_contracts +#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_initials_case +#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_initials_case +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_name_initials #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_name_initials msgid "Name Initials" msgstr "Фамилия с инициалами" -#. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_initials_case -#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_initials_case -msgid "Name Initials Case" -msgstr "Фамилия с инициалами" - -#. module: client_contracts -#: model:ir.model.fields,field_description:client_contracts.field_res_partner_name_parent_case -#: model:ir.model.fields,field_description:client_contracts.field_res_users_name_parent_case -msgid "Name Parent Case" -msgstr "Полное имя в родительном падеже" - #. module: client_contracts #: model:ir.model.fields,help:client_contracts.field_res_partner_contract_field_technical_name #: model:ir.model.fields,help:client_contracts.field_res_partner_contract_field_transient_technical_name @@ -606,32 +590,20 @@ msgstr "Партнёр; Сертификат о регистрации ИП" msgid "Partner Representative" msgstr "Представитель Партнёра" -#. module: client_contracts -#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_date -msgid "Passport Date" -msgstr "Паспорт выдан" - #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_department -msgid "Passport Department" -msgstr "Паспорт выдан" - -#. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_department msgid "Passport Issued by" msgstr "Паспорт выдан" #. module: client_contracts +#: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_date #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_date msgid "Passport Issued on" msgstr "Паспорт выдан" #. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_partner_representer_passport_number -msgid "Passport Number" -msgstr "Серия и номер паспорта" - -#. module: client_contracts #: model:res.partner.contract.field,name:client_contracts.contract_field_seller_representer_passport_number msgid "Passport №" msgstr "Паспорт №" From 83fd3a461f9cedc7d6413c41f1a3310c1ce14797 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Sat, 28 Dec 2019 15:35:52 +0500 Subject: [PATCH 55/64] [IMP] makes invisible payment_term and delivery_time cuz it dont uses --- views/res_partner_contract_annex.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/res_partner_contract_annex.xml b/views/res_partner_contract_annex.xml index 5fa44a4..3e0e4ac 100644 --- a/views/res_partner_contract_annex.xml +++ b/views/res_partner_contract_annex.xml @@ -15,8 +15,8 @@ - - + +