mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-08-17 16:54:42 -05:00
[PATCH] Upstream patch - 08092023
This commit is contained in:
@@ -685,6 +685,7 @@ class AccountReconcileModel(models.Model):
|
||||
AND move.state = 'posted'
|
||||
AND account.reconcile IS TRUE
|
||||
AND aml.reconciled IS FALSE
|
||||
AND (account.internal_type NOT IN ('receivable', 'payable') OR aml.payment_id IS NULL)
|
||||
'''
|
||||
|
||||
# Add conditions to handle each of the statement lines we want to match
|
||||
|
||||
@@ -87,7 +87,8 @@ class GeoCoder(models.AbstractModel):
|
||||
return None
|
||||
url = 'https://nominatim.openstreetmap.org/search'
|
||||
try:
|
||||
headers = {'User-Agent': 'Flectra (http://www.flectrahq.com/contactus)'}
|
||||
headers = {'User-Agent': self.env['ir.config_parameter'].sudo().get_param('base_geolocalize.user_agent',
|
||||
'Flectra (http://www.flectrahq.com/contactus)')}
|
||||
response = requests.get(url, headers=headers, params={'format': 'json', 'q': addr})
|
||||
_logger.info('openstreetmap nominatim service called')
|
||||
if response.status_code != 200:
|
||||
|
||||
@@ -77,13 +77,17 @@ class StockPicking(models.Model):
|
||||
|
||||
@api.depends('move_line_ids', 'move_line_ids.result_package_id')
|
||||
def _compute_packages(self):
|
||||
for package in self:
|
||||
packs = set()
|
||||
if self.env['stock.move.line'].search_count([('picking_id', '=', package.id), ('result_package_id', '!=', False)]):
|
||||
for move_line in package.move_line_ids:
|
||||
if move_line.result_package_id:
|
||||
packs.add(move_line.result_package_id.id)
|
||||
package.package_ids = list(packs)
|
||||
packages = {
|
||||
res["picking_id"][0]: set(res["result_package_id"])
|
||||
for res in self.env["stock.move.line"].read_group(
|
||||
[("picking_id", "in", self.ids), ("result_package_id", "!=", False)],
|
||||
["result_package_id:array_agg"],
|
||||
["picking_id"],
|
||||
lazy=False, orderby="picking_id asc",
|
||||
)
|
||||
}
|
||||
for picking in self:
|
||||
picking.package_ids = list(packages.get(picking.id, []))
|
||||
|
||||
@api.depends('move_line_ids', 'move_line_ids.result_package_id', 'move_line_ids.product_uom_id', 'move_line_ids.qty_done')
|
||||
def _compute_bulk_weight(self):
|
||||
|
||||
@@ -3,94 +3,94 @@ employee_resume_admin_park_lake_state_school,hr.employee_admin,Park Lake State S
|
||||
employee_resume_admin_blue_mountains_grammar_school,hr.employee_admin,Blue Mountains Grammar School,2008-12-09,2011-12-16,resume_type_education,
|
||||
employee_resume_admin_harrington_park_public_school,hr.employee_admin,Harrington Park Public School,2006-09-21,2008-11-15,resume_type_education,
|
||||
employee_resume_admin_schultz_inc,hr.employee_admin,Schultz Inc,2009-03-23,,resume_type_experience,"Engineer, electrical"
|
||||
employee_resume_admin_greeneorr,hr.employee_admin,Greene-Orr,2008-01-21,2006-09-21,resume_type_experience,Magazine journalist
|
||||
employee_resume_admin_white_inc,hr.employee_admin,White Inc,2007-05-24,2006-12-22,resume_type_experience,"Designer, television/film set"
|
||||
employee_resume_admin_lewisbailey,hr.employee_admin,Lewis-Bailey,2009-04-22,2006-12-22,resume_type_experience,Civil Service fast streamer
|
||||
employee_resume_admin_white_inc,hr.employee_admin,White Inc,2007-05-24,2008-11-22,resume_type_experience,"Designer, television/film set"
|
||||
employee_resume_admin_greeneorr,hr.employee_admin,Greene-Orr,2008-12-23,2009-09-21,resume_type_experience,Magazine journalist
|
||||
employee_resume_admin_lewisbailey,hr.employee_admin,Lewis-Bailey,2009-10-22,2011-12-22,resume_type_experience,Civil Service fast streamer
|
||||
employee_resume_al_bathurst_west_public_school,hr.employee_al,Bathurst West Public School,1997-05-06,1998-03-18,resume_type_education,
|
||||
employee_resume_al_jones_ltd,hr.employee_al,Jones Ltd,1998-02-05,1997-08-05,resume_type_experience,Energy manager
|
||||
employee_resume_al_jones_ltd,hr.employee_al,Jones Ltd,1998-02-05,1999-08-05,resume_type_experience,Energy manager
|
||||
employee_resume_al_garcia_smith_and_king,hr.employee_al,"Garcia, Smith and King",1998-09-05,,resume_type_experience,Medical illustrator
|
||||
employee_resume_mit_seymour_p12_college,hr.employee_mit,Seymour P-12 College,2013-08-11,2015-07-01,resume_type_education,
|
||||
employee_resume_mit_darlington_primary_school,hr.employee_mit,Darlington Primary School,2012-08-08,2013-05-05,resume_type_education,
|
||||
employee_resume_mit_sutherland_dianella_primary_school,hr.employee_mit,Sutherland Dianella Primary School,2010-03-25,2012-06-27,resume_type_education,
|
||||
employee_resume_mit_burns_lester_and_cuevas,hr.employee_mit,"Burns, Lester and Cuevas",2012-04-24,2010-05-26,resume_type_experience,Police officer
|
||||
employee_resume_mit_hill_group,hr.employee_mit,Hill Group,2012-05-25,2010-04-25,resume_type_experience,Glass blower/designer
|
||||
employee_resume_mit_parker_roberson_and_acosta,hr.employee_mit,"Parker, Roberson and Acosta",2013-03-25,2010-04-25,resume_type_experience,Science writer
|
||||
employee_resume_mit_robinson_crawford_and_norman,hr.employee_mit,"Robinson, Crawford and Norman",2011-10-23,2010-06-23,resume_type_experience,Psychiatric nurse
|
||||
employee_resume_mit_burns_lester_and_cuevas,hr.employee_mit,"Burns, Lester and Cuevas",2012-04-24,2012-05-26,resume_type_experience,Police officer
|
||||
employee_resume_mit_hill_group,hr.employee_mit,Hill Group,2012-05-28,2014-04-25,resume_type_experience,Glass blower/designer
|
||||
employee_resume_mit_parker_roberson_and_acosta,hr.employee_mit,"Parker, Roberson and Acosta",2014-06-25,2016-04-25,resume_type_experience,Science writer
|
||||
employee_resume_mit_robinson_crawford_and_norman,hr.employee_mit,"Robinson, Crawford and Norman",2017-10-23,2019-06-23,resume_type_experience,Psychiatric nurse
|
||||
employee_resume_niv_kialla_west_primary_school,hr.employee_niv,Kialla West Primary School,2016-08-23,2017-03-26,resume_type_education,
|
||||
employee_resume_niv_arroyo_ltd,hr.employee_niv,Arroyo Ltd,2017-05-23,2016-09-23,resume_type_experience,Insurance risk surveyor
|
||||
employee_resume_niv_arroyo_ltd,hr.employee_niv,Arroyo Ltd,2017-05-23,2018-09-23,resume_type_experience,Insurance risk surveyor
|
||||
employee_resume_stw_northern_bay_p12_college,hr.employee_stw,Northern Bay P-12 College,2016-03-25,2017-06-03,resume_type_education,
|
||||
employee_resume_stw_whitsunday_anglican_school,hr.employee_stw,Whitsunday Anglican School,2014-05-06,2016-03-21,resume_type_education,
|
||||
employee_resume_stw_tyndale_christian_school,hr.employee_stw,Tyndale Christian School,2011-03-04,2014-03-28,resume_type_education,
|
||||
employee_resume_stw_green_ltd,hr.employee_stw,Green Ltd,2013-01-31,2011-04-01,resume_type_experience,Arboriculturist
|
||||
employee_resume_stw_green_ltd,hr.employee_stw,Green Ltd,2013-01-31,2015-04-01,resume_type_experience,Arboriculturist
|
||||
employee_resume_stw_lynchhodges,hr.employee_stw,Lynch-Hodges,2012-12-01,,resume_type_experience,Publishing rights manager
|
||||
employee_resume_stw_finley_rowe_and_adams,hr.employee_stw,"Finley, Rowe and Adams",2012-12-31,,resume_type_experience,"Copywriter, advertising"
|
||||
employee_resume_chs_avoca_primary_school,hr.employee_chs,Avoca Primary School,1996-03-04,1996-10-26,resume_type_education,
|
||||
employee_resume_chs_boyd_wilson_and_moore,hr.employee_chs,"Boyd, Wilson and Moore",1997-11-03,,resume_type_experience,Medical physicist
|
||||
employee_resume_chs_freeman_williams_and_berger,hr.employee_chs,"Freeman, Williams and Berger",1997-02-02,1996-06-04,resume_type_experience,Human resources officer
|
||||
employee_resume_chs_hanson_roach_and_jordan,hr.employee_chs,"Hanson, Roach and Jordan",1997-03-04,1996-03-04,resume_type_experience,Geographical information systems officer
|
||||
employee_resume_chs_davis_plc,hr.employee_chs,Davis PLC,1996-10-05,1996-06-04,resume_type_experience,"Secretary, company"
|
||||
employee_resume_chs_freeman_williams_and_berger,hr.employee_chs,"Freeman, Williams and Berger",1997-02-02,1997-08-04,resume_type_experience,Human resources officer
|
||||
employee_resume_chs_hanson_roach_and_jordan,hr.employee_chs,"Hanson, Roach and Jordan",1998-03-04,2003-03-04,resume_type_experience,Geographical information systems officer
|
||||
employee_resume_chs_davis_plc,hr.employee_chs,Davis PLC,2004-10-05,2016-06-04,resume_type_experience,"Secretary, company"
|
||||
employee_resume_qdp_parke_state_school,hr.employee_qdp,Parke State School,1997-06-26,1999-03-17,resume_type_education,
|
||||
employee_resume_qdp_evans_cooper_and_white,hr.employee_qdp,"Evans, Cooper and White",1999-04-26,,resume_type_experience,"Therapist, speech and language"
|
||||
employee_resume_qdp_rivera_shaw_and_hughes,hr.employee_qdp,"Rivera, Shaw and Hughes",1998-11-26,,resume_type_experience,Landscape architect
|
||||
employee_resume_qdp_phillips_jones_and_brown,hr.employee_qdp,"Phillips, Jones and Brown",1999-12-27,1997-07-27,resume_type_experience,"Teacher, special educational needs"
|
||||
employee_resume_qdp_hughes_parker_and_barber,hr.employee_qdp,"Hughes, Parker and Barber",1999-02-24,1997-07-27,resume_type_experience,"Engineer, drilling"
|
||||
employee_resume_qdp_phillips_jones_and_brown,hr.employee_qdp,"Phillips, Jones and Brown",1999-12-27,2001-07-27,resume_type_experience,"Teacher, special educational needs"
|
||||
employee_resume_qdp_hughes_parker_and_barber,hr.employee_qdp,"Hughes, Parker and Barber",2002-02-24,2007-07-27,resume_type_experience,"Engineer, drilling"
|
||||
employee_resume_fme_st_michaels_primary_school,hr.employee_fme,St Michael's Primary School,2006-12-22,2009-01-23,resume_type_education,
|
||||
employee_resume_fme_wodonga_primary_school,hr.employee_fme,Wodonga Primary School,2006-02-21,2006-09-27,resume_type_education,
|
||||
employee_resume_fme_leinster_school,hr.employee_fme,Leinster School,2003-10-14,2005-11-09,resume_type_education,
|
||||
employee_resume_fme_russellwebster,hr.employee_fme,Russell-Webster,2006-05-14,2003-11-14,resume_type_experience,"Biochemist, clinical"
|
||||
employee_resume_fme_lewis_group,hr.employee_fme,Lewis Group,2004-07-14,2003-11-14,resume_type_experience,Sports development officer
|
||||
employee_resume_fme_johnson_shaw_and_carroll,hr.employee_fme,"Johnson, Shaw and Carroll",2004-07-14,2003-11-14,resume_type_experience,"Engineer, mining"
|
||||
employee_resume_fme_russellwebster,hr.employee_fme,Russell-Webster,2006-05-14,2008-11-14,resume_type_experience,"Biochemist, clinical"
|
||||
employee_resume_fme_lewis_group,hr.employee_fme,Lewis Group,2004-07-14,2005-11-14,resume_type_experience,Sports development officer
|
||||
employee_resume_fme_johnson_shaw_and_carroll,hr.employee_fme,"Johnson, Shaw and Carroll",2004-07-14,2005-11-14,resume_type_experience,"Engineer, mining"
|
||||
employee_resume_fpi_st_raphaels_primary_school,hr.employee_fpi,St Raphael's Primary School,2006-08-13,2008-09-30,resume_type_education,
|
||||
employee_resume_fpi_woodridge_state_school,hr.employee_fpi,Woodridge State School,2005-12-28,2006-08-09,resume_type_education,
|
||||
employee_resume_fpi_our_lady_star_of_the_sea_school,hr.employee_fpi,Our Lady Star of the Sea School,2003-06-07,2005-12-26,resume_type_education,
|
||||
employee_resume_fpi_chavez_group,hr.employee_fpi,Chavez Group,2004-04-06,,resume_type_experience,Mental health nurse
|
||||
employee_resume_fpi_hubbarddean,hr.employee_fpi,Hubbard-Dean,2005-05-07,2003-08-08,resume_type_experience,Conference centre manager
|
||||
employee_resume_fpi_hubbarddean,hr.employee_fpi,Hubbard-Dean,2005-05-07,2007-08-08,resume_type_experience,Conference centre manager
|
||||
employee_resume_jth_narellan_public_school,hr.employee_jth,Narellan Public School,2004-11-02,2007-10-09,resume_type_education,
|
||||
employee_resume_jth_wilkinson_plc,hr.employee_jth,Wilkinson PLC,2006-02-01,,resume_type_experience,Architectural technologist
|
||||
employee_resume_jth_simmonswilcox,hr.employee_jth,Simmons-Wilcox,2005-09-03,2004-12-03,resume_type_experience,IT sales professional
|
||||
employee_resume_jth_simmonswilcox,hr.employee_jth,Simmons-Wilcox,2005-09-03,2006-12-03,resume_type_experience,IT sales professional
|
||||
employee_resume_jth_goodman_inc,hr.employee_jth,Goodman Inc,2007-06-03,,resume_type_experience,Analytical chemist
|
||||
employee_resume_ngh_armidale_city_public_school,hr.employee_ngh,Armidale City Public School,1994-11-19,1997-02-18,resume_type_education,
|
||||
employee_resume_ngh_craigmore_south_junior_primary_school,hr.employee_ngh,Craigmore South Junior Primary School,1993-05-11,1994-08-24,resume_type_education,
|
||||
employee_resume_ngh_stanleymendez,hr.employee_ngh,Stanley-Mendez,1993-12-12,1993-05-11,resume_type_experience,Glass blower/designer
|
||||
employee_resume_ngh_jackson_schwartz_and_aguirre,hr.employee_ngh,"Jackson, Schwartz and Aguirre",1995-04-12,1993-07-12,resume_type_experience,Analytical chemist
|
||||
employee_resume_ngh_stanleymendez,hr.employee_ngh,Stanley-Mendez,1993-12-12,1994-05-11,resume_type_experience,Glass blower/designer
|
||||
employee_resume_ngh_jackson_schwartz_and_aguirre,hr.employee_ngh,"Jackson, Schwartz and Aguirre",1995-04-12,1997-07-12,resume_type_experience,Analytical chemist
|
||||
employee_resume_vad_wycheproof_p12_college,hr.employee_vad,Wycheproof P-12 College,1999-06-02,2000-12-01,resume_type_education,
|
||||
employee_resume_vad_christian_outreach_college,hr.employee_vad,Christian Outreach College,1996-08-02,1999-02-01,resume_type_education,
|
||||
employee_resume_vad_thomas_chirnside_primary_school,hr.employee_vad,Thomas Chirnside Primary School,1995-05-05,1996-07-27,resume_type_education,
|
||||
employee_resume_vad_loganmartin,hr.employee_vad,Logan-Martin,1996-04-04,1995-07-05,resume_type_experience,Petroleum engineer
|
||||
employee_resume_vad_gallegos_little_and_walters,hr.employee_vad,"Gallegos, Little and Walters",1996-12-02,1995-08-05,resume_type_experience,"Lecturer, higher education"
|
||||
employee_resume_vad_loganmartin,hr.employee_vad,Logan-Martin,1996-04-04,1997-07-05,resume_type_experience,Petroleum engineer
|
||||
employee_resume_vad_gallegos_little_and_walters,hr.employee_vad,"Gallegos, Little and Walters",1996-12-02,1997-08-05,resume_type_experience,"Lecturer, higher education"
|
||||
employee_resume_han_king_island_district_high_school,hr.employee_han,King Island District High School,2014-08-17,2016-05-06,resume_type_education,
|
||||
employee_resume_han_elphinstone_primary_school,hr.employee_han,Elphinstone Primary School,2013-07-18,2014-07-29,resume_type_education,
|
||||
employee_resume_han_william_light_r12_school,hr.employee_han,William Light R-12 School,2011-01-29,2013-03-30,resume_type_education,
|
||||
employee_resume_han_davis_plc,hr.employee_han,Davis PLC,2012-10-30,2011-01-29,resume_type_experience,"Engineer, production"
|
||||
employee_resume_han_davis_plc,hr.employee_han,Davis PLC,2012-10-30,2013-08-29,resume_type_experience,"Engineer, production"
|
||||
employee_resume_han_perezmorgan,hr.employee_han,Perez-Morgan,2013-05-01,,resume_type_experience,Geoscientist
|
||||
employee_resume_jve_ellinbank_primary_school,hr.employee_jve,Ellinbank Primary School,2003-02-16,2004-05-18,resume_type_education,
|
||||
employee_resume_jve_talbot_primary_school,hr.employee_jve,Talbot Primary School,2002-07-01,2003-02-09,resume_type_education,
|
||||
employee_resume_jve_saundersadkins,hr.employee_jve,Saunders-Adkins,2003-07-01,,resume_type_experience,Jewellery designer
|
||||
employee_resume_jve_davis_and_sons,hr.employee_jve,Davis and Sons,2004-12-28,2002-07-01,resume_type_experience,Health physicist
|
||||
employee_resume_jve_davis_and_sons,hr.employee_jve,Davis and Sons,2004-12-28,2006-07-01,resume_type_experience,Health physicist
|
||||
employee_resume_jve_arnoldcohen,hr.employee_jve,Arnold-Cohen,2003-12-29,,resume_type_experience,Personnel officer
|
||||
employee_resume_jep_lawson_public_school,hr.employee_jep,Lawson Public School,1998-06-07,2000-02-17,resume_type_education,
|
||||
employee_resume_jep_trinity_college,hr.employee_jep,Trinity College,1995-08-21,1998-04-10,resume_type_education,
|
||||
employee_resume_jep_woodend_primary_school,hr.employee_jep,Woodend Primary School,1992-11-22,1995-05-05,resume_type_education,
|
||||
employee_resume_jep_mcneil_rodriguez_and_warren,hr.employee_jep,"Mcneil, Rodriguez and Warren",1994-11-22,1993-01-22,resume_type_experience,Sub
|
||||
employee_resume_jep_davis_sanchez_and_miller,hr.employee_jep,"Davis, Sanchez and Miller",1995-05-25,1992-11-22,resume_type_experience,Customer service manager
|
||||
employee_resume_jep_mcneil_rodriguez_and_warren,hr.employee_jep,"Mcneil, Rodriguez and Warren",1994-11-22,1996-01-22,resume_type_experience,Sub
|
||||
employee_resume_jep_davis_sanchez_and_miller,hr.employee_jep,"Davis, Sanchez and Miller",1996-05-25,1997-11-22,resume_type_experience,Customer service manager
|
||||
employee_resume_jep_cole_ltd,hr.employee_jep,Cole Ltd,1994-02-22,,resume_type_experience,Fast food restaurant manager
|
||||
employee_resume_jep_garcia_and_sons,hr.employee_jep,Garcia and Sons,1995-07-25,1992-12-23,resume_type_experience,Careers information officer
|
||||
employee_resume_jep_garcia_and_sons,hr.employee_jep,Garcia and Sons,1998-07-25,1999-12-23,resume_type_experience,Careers information officer
|
||||
employee_resume_jod_umbakumba_school,hr.employee_jod,Umbakumba School,2009-11-08,2010-09-30,resume_type_education,
|
||||
employee_resume_jod_wilson_ltd,hr.employee_jod,Wilson Ltd,2011-02-07,2010-01-08,resume_type_experience,Trade union research officer
|
||||
employee_resume_jod_wilson_ltd,hr.employee_jod,Wilson Ltd,2011-02-07,2012-01-08,resume_type_experience,Trade union research officer
|
||||
employee_resume_jog_port_curtis_road_state_school,hr.employee_jog,Port Curtis Road State School,2005-04-10,2006-09-30,resume_type_education,
|
||||
employee_resume_jog_claremont_college,hr.employee_jog,Claremont College,2004-01-12,2005-03-10,resume_type_education,
|
||||
employee_resume_jog_mandurah_catholic_college,hr.employee_jog,Mandurah Catholic College,2003-02-08,2003-09-28,resume_type_education,
|
||||
employee_resume_jog_douglas_thompson_and_conner,hr.employee_jog,"Douglas, Thompson and Conner",2004-01-10,,resume_type_experience,Music therapist
|
||||
employee_resume_jog_allenkeller,hr.employee_jog,Allen-Keller,2005-07-09,2003-03-11,resume_type_experience,Lexicographer
|
||||
employee_resume_jog_allenkeller,hr.employee_jog,Allen-Keller,2005-07-09,2007-03-11,resume_type_experience,Lexicographer
|
||||
employee_resume_jgo_tottenham_central_school,hr.employee_jgo,Tottenham Central School,2001-04-13,2002-09-06,resume_type_education,
|
||||
employee_resume_jgo_galilee_catholic_school,hr.employee_jgo,Galilee Catholic School,2000-08-07,2001-02-16,resume_type_education,
|
||||
employee_resume_jgo_martin_stanley_and_duncan,hr.employee_jgo,"Martin, Stanley and Duncan",2001-05-07,,resume_type_experience,IT technical support officer
|
||||
employee_resume_jgo_fox_and_sons,hr.employee_jgo,Fox and Sons,2003-03-07,2000-10-05,resume_type_experience,Merchant navy officer
|
||||
employee_resume_jgo_fox_and_sons,hr.employee_jgo,Fox and Sons,2003-03-07,2005-10-05,resume_type_experience,Merchant navy officer
|
||||
employee_resume_lur_holy_family_primary_school,hr.employee_lur,Holy Family Primary School,2009-07-16,2012-07-23,resume_type_education,
|
||||
employee_resume_lur_lindenow_primary_school,hr.employee_lur,Lindenow Primary School,2007-07-08,2009-07-16,resume_type_education,
|
||||
employee_resume_lur_narrogin_primary_school,hr.employee_lur,Narrogin Primary School,2005-12-14,2007-06-10,resume_type_education,
|
||||
employee_resume_lur_ramirez_inc,hr.employee_lur,Ramirez Inc,2006-11-13,,resume_type_experience,Glass blower/designer
|
||||
employee_resume_lur_whitebell,hr.employee_lur,White-Bell,2006-04-15,2006-01-13,resume_type_experience,Sports coach
|
||||
employee_resume_lur_whitebell,hr.employee_lur,White-Bell,2006-04-15,2006-07-13,resume_type_experience,Sports coach
|
||||
employee_resume_hne_st_peters_parish_primary_school,hr.employee_hne,St Peter's Parish Primary School,2008-05-18,2008-11-17,resume_type_education,
|
||||
employee_resume_hne_dandenong_north_primary_school,hr.employee_hne,Dandenong North Primary School,2005-07-20,2008-02-15,resume_type_education,
|
||||
employee_resume_hne_nortonsilva,hr.employee_hne,Norton-Silva,2007-05-21,2005-09-19,resume_type_experience,"Horticulturist, commercial"
|
||||
employee_resume_hne_nortonsilva,hr.employee_hne,Norton-Silva,2007-05-21,2009-09-19,resume_type_experience,"Horticulturist, commercial"
|
||||
|
||||
|
@@ -50,7 +50,7 @@ class ResumeLine(models.Model):
|
||||
display_type = fields.Selection([('classic', 'Classic')], string="Display Type", default='classic')
|
||||
|
||||
_sql_constraints = [
|
||||
('date_check', "CHECK ((date_start <= date_end OR date_end = NULL))", "The start date must be anterior to the end date."),
|
||||
('date_check', "CHECK ((date_start <= date_end OR date_end IS NULL))", "The start date must be anterior to the end date."),
|
||||
]
|
||||
|
||||
|
||||
|
||||
@@ -12,7 +12,9 @@
|
||||
"cuenta115_05","Mercancías en tránsito","115.05.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_05","True"
|
||||
"cuenta115_06","Mercancías en poder de terceros","115.06.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_06","False"
|
||||
"cuenta118_01","IVA acreditable pagado","118.01.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_118_01","False"
|
||||
"cuenta118_03","IEPS acreditable pagado","118.03.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_118_03","False"
|
||||
"cuenta119_01","IVA pendiente de pago","119.01.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_119_01","True"
|
||||
"cuenta119_03","IEPS pendiente de pago","119.03.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_119_03","True"
|
||||
"cuenta120_01","Anticipo a proveedores nacional","120.01.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_120_01","True"
|
||||
"cuenta120_02","Anticipo a proveedores extranjero","120.02.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_120_02","True"
|
||||
"cuenta201_01","Proveedores nacionales","201.01.01","account.data_account_type_payable","l10n_mx.mx_coa","l10n_mx.account_tag_201_01","True"
|
||||
@@ -21,7 +23,9 @@
|
||||
"cuenta206_02","Anticipo de cliente extranjero","206.02.01","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_206_02","True"
|
||||
"cuenta206_05_01","Otros anticipos de clientes","206.05.01","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_206_05","True"
|
||||
"cuenta208_01","IVA trasladado cobrado","208.01.01","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_208_01","False"
|
||||
"cuenta208_02","IEPS trasladado cobrado","208.02.01","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_208_02","False"
|
||||
"cuenta209_01","IVA trasladado no cobrado","209.01.01","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_209_01","True"
|
||||
"cuenta209_02","IEPS trasladado no cobrado","209.02.01","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_209_02","True"
|
||||
"cuenta216_03","Impuestos retenidos de ISR por arrendamiento","216.03.01","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_216_03","False"
|
||||
"cuenta216_04","Impuestos retenidos de ISR por servicios profesionales","216.04.01","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_216_04","False"
|
||||
"cuenta216_10","Impuestos retenidos de IVA","216.10.10","account.data_account_type_current_liabilities","l10n_mx.mx_coa","l10n_mx.account_tag_216_10","False"
|
||||
|
||||
|
@@ -30,5 +30,25 @@
|
||||
<record id="tax_group_isr_ret_10" model="account.tax.group">
|
||||
<field name="name">ISR Retencion 10%</field>
|
||||
</record>
|
||||
|
||||
<record id="tax_group_ieps_8" model="account.tax.group">
|
||||
<field name="name">IEPS 8%</field>
|
||||
</record>
|
||||
|
||||
<record id="tax_group_ieps_25" model="account.tax.group">
|
||||
<field name="name">IEPS 25%</field>
|
||||
</record>
|
||||
|
||||
<record id="tax_group_ieps_26_5" model="account.tax.group">
|
||||
<field name="name">IEPS 26.5%</field>
|
||||
</record>
|
||||
|
||||
<record id="tax_group_ieps_30" model="account.tax.group">
|
||||
<field name="name">IEPS 30%</field>
|
||||
</record>
|
||||
|
||||
<record id="tax_group_ieps_53" model="account.tax.group">
|
||||
<field name="name">IEPS 53%</field>
|
||||
</record>
|
||||
</data>
|
||||
</flectra>
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<flectra>
|
||||
<data>
|
||||
<record id="tax9" model="account.tax.template">
|
||||
<field name="sequence" eval="10"/>
|
||||
|
||||
<record id="ieps_8_sale" model="account.tax.template">
|
||||
<field name="sequence" eval="0"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IVA(0%) VENTAS</field>
|
||||
<field name="description">IVA(0%)</field>
|
||||
<field name="amount">0</field>
|
||||
<field name="name">IEPS 8% VENTAS</field>
|
||||
<field name="description">IEPS 8%</field>
|
||||
<field name="amount">8</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="tax_group_id" ref="tax_group_iva_0"/>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_8"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_01"/>
|
||||
<field name="l10n_mx_tax_type">Tasa</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_02"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
@@ -22,8 +23,8 @@
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'account_id': ref('cuenta208_01'),
|
||||
'tag_ids': [ref('tag_iva')],
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
@@ -35,24 +36,24 @@
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'account_id': ref('cuenta208_01'),
|
||||
'tag_ids': [ref('tag_iva')],
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="tax12" model="account.tax.template">
|
||||
<record id="ieps_8_purchase" model="account.tax.template">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IVA(16%) VENTAS</field>
|
||||
<field name="description">IVA(16%)</field>
|
||||
<field name="amount">16</field>
|
||||
<field name="name">IEPS 8% COMPRAS</field>
|
||||
<field name="description">IEPS 8%</field>
|
||||
<field name="amount">8</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="tax_group_id" ref="tax_group_iva_16"/>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_8"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_01"/>
|
||||
<field name="l10n_mx_tax_type">Tasa</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta119_03"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
@@ -62,8 +63,8 @@
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'account_id': ref('cuenta208_01'),
|
||||
'tag_ids': [ref('tag_iva')],
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
@@ -75,8 +76,328 @@
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'account_id': ref('cuenta208_01'),
|
||||
'tag_ids': [ref('tag_iva')],
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="ieps_25_sale" model="account.tax.template">
|
||||
<field name="sequence" eval="2"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IEPS 25% VENTAS</field>
|
||||
<field name="description">IEPS 25%</field>
|
||||
<field name="amount">25</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_25"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_02"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="ieps_25_purchase" model="account.tax.template">
|
||||
<field name="sequence" eval="3"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IEPS 25% COMPRAS</field>
|
||||
<field name="description">IEPS 25%</field>
|
||||
<field name="amount">25</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_25"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta119_03"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="ieps_26_5_sale" model="account.tax.template">
|
||||
<field name="sequence" eval="4"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IEPS 26.5% VENTAS</field>
|
||||
<field name="description">IEPS 26.5%</field>
|
||||
<field name="amount">26.5</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_26_5"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_02"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="ieps_26_5_purchase" model="account.tax.template">
|
||||
<field name="sequence" eval="5"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IEPS 26.5% COMPRAS</field>
|
||||
<field name="description">IEPS 26.5%</field>
|
||||
<field name="amount">26.5</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_26_5"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta119_03"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="ieps_30_sale" model="account.tax.template">
|
||||
<field name="sequence" eval="6"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IEPS 30% VENTAS</field>
|
||||
<field name="description">IEPS 30%</field>
|
||||
<field name="amount">30</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_30"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_02"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="ieps_30_purchase" model="account.tax.template">
|
||||
<field name="sequence" eval="7"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IEPS 30% COMPRAS</field>
|
||||
<field name="description">IEPS 30%</field>
|
||||
<field name="amount">30</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_30"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta119_03"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="ieps_53_sale" model="account.tax.template">
|
||||
<field name="sequence" eval="8"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IEPS 53% VENTAS</field>
|
||||
<field name="description">IEPS 53%</field>
|
||||
<field name="amount">53</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_53"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_02"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta208_02'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="ieps_53_purchase" model="account.tax.template">
|
||||
<field name="sequence" eval="9"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IEPS 53% COMPRAS</field>
|
||||
<field name="description">IEPS 53%</field>
|
||||
<field name="amount">53</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="tax_group_id" ref="tax_group_ieps_53"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="include_base_amount">1</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta119_03"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'tag_ids': [ref('l10n_mx.tag_ieps')],
|
||||
'account_id': ref('l10n_mx.cuenta118_03'),
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
@@ -85,7 +406,7 @@
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">RET IVA FLETES 4%</field>
|
||||
<field name="description">Retención IVA(-4%)</field>
|
||||
<field name="description">RET IVA -4%</field>
|
||||
<field name="amount">-4</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -122,10 +443,10 @@
|
||||
</record>
|
||||
|
||||
<record id="tax2" model="account.tax.template">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="sequence" eval="11"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">RET IVA ARRENDAMIENTO 10%</field>
|
||||
<field name="description">Retención IVA(-10%)</field>
|
||||
<field name="description">RET IVA -10%</field>
|
||||
<field name="amount">-10</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -162,10 +483,10 @@
|
||||
</record>
|
||||
|
||||
<record id="tax3" model="account.tax.template">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="sequence" eval="12"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">RET ISR ARRENDAMIENTO 10%</field>
|
||||
<field name="description">Retención ISR(-10%)</field>
|
||||
<field name="description">RET ISR -10%</field>
|
||||
<field name="amount">-10</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -198,10 +519,10 @@
|
||||
</record>
|
||||
|
||||
<record id="tax5" model="account.tax.template">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="sequence" eval="13"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">RET ISR HONORARIOS 10%</field>
|
||||
<field name="description">Retención ISR(-10%)</field>
|
||||
<field name="description">RET ISR -10%</field>
|
||||
<field name="amount">-10</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -234,10 +555,10 @@
|
||||
</record>
|
||||
|
||||
<record id="tax7" model="account.tax.template">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="sequence" eval="14"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">RETENCION IVA ARRENDAMIENTO 10.67%</field>
|
||||
<field name="description">Retención IVA(-10.67%)</field>
|
||||
<field name="name">RET IVA ARRENDAMIENTO 10.67%</field>
|
||||
<field name="description">RET IVA -10.67%</field>
|
||||
<field name="amount">-10.67</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -274,10 +595,10 @@
|
||||
</record>
|
||||
|
||||
<record id="tax8" model="account.tax.template">
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="sequence" eval="15"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">RETENCION IVA HONORARIOS 10.67%</field>
|
||||
<field name="description">Retención IVA(-10.67%)</field>
|
||||
<field name="name">RET IVA HONORARIOS 10.67%</field>
|
||||
<field name="description">RET IVA -10.67%</field>
|
||||
<field name="amount">-10.67</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -313,11 +634,91 @@
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="tax13" model="account.tax.template">
|
||||
<field name="sequence" eval="10"/>
|
||||
<record id="tax9" model="account.tax.template">
|
||||
<field name="sequence" eval="16"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IVA(0%) COMPRAS</field>
|
||||
<field name="description">IVA(0%)</field>
|
||||
<field name="name">IVA 0% VENTAS</field>
|
||||
<field name="description">IVA 0%</field>
|
||||
<field name="amount">0</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="tax_group_id" ref="tax_group_iva_0"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_01"/>
|
||||
<field name="l10n_mx_tax_type">Tasa</field>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'account_id': ref('cuenta208_01'),
|
||||
'tag_ids': [ref('tag_iva')],
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'account_id': ref('cuenta208_01'),
|
||||
'tag_ids': [ref('tag_iva')],
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="tax12" model="account.tax.template">
|
||||
<field name="sequence" eval="17"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IVA 16% VENTAS</field>
|
||||
<field name="description">IVA 16%</field>
|
||||
<field name="amount">16</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="tax_group_id" ref="tax_group_iva_16"/>
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_01"/>
|
||||
<field name="l10n_mx_tax_type">Tasa</field>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'account_id': ref('cuenta208_01'),
|
||||
'tag_ids': [ref('tag_iva')],
|
||||
}),
|
||||
]"/>
|
||||
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'base',
|
||||
}),
|
||||
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
'repartition_type': 'tax',
|
||||
'account_id': ref('cuenta208_01'),
|
||||
'tag_ids': [ref('tag_iva')],
|
||||
}),
|
||||
]"/>
|
||||
</record>
|
||||
|
||||
<record id="tax13" model="account.tax.template">
|
||||
<field name="sequence" eval="18"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IVA 0% COMPRAS</field>
|
||||
<field name="description">IVA 0%</field>
|
||||
<field name="amount">0</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -354,10 +755,10 @@
|
||||
</record>
|
||||
|
||||
<record id="tax14" model="account.tax.template">
|
||||
<field name="sequence" eval="1"/>
|
||||
<field name="sequence" eval="19"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IVA(16%) COMPRAS</field>
|
||||
<field name="description">IVA(16%)</field>
|
||||
<field name="name">IVA 16% COMPRAS</field>
|
||||
<field name="description">IVA 16%</field>
|
||||
<field name="amount">16</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -394,9 +795,10 @@
|
||||
</record>
|
||||
|
||||
<record id="tax16" model="account.tax.template">
|
||||
<field name="sequence" eval="20"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IVA(8%) COMPRAS</field>
|
||||
<field name="description">IVA(8%)</field>
|
||||
<field name="name">IVA 8% COMPRAS</field>
|
||||
<field name="description">IVA 8%</field>
|
||||
<field name="amount">8</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
@@ -404,7 +806,6 @@
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta119_01"/>
|
||||
<field name="l10n_mx_tax_type">Tasa</field>
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
@@ -434,9 +835,10 @@
|
||||
</record>
|
||||
|
||||
<record id="tax17" model="account.tax.template">
|
||||
<field name="sequence" eval="21"/>
|
||||
<field name="chart_template_id" ref="mx_coa"/>
|
||||
<field name="name">IVA(8%) VENTAS</field>
|
||||
<field name="description">IVA(8%)</field>
|
||||
<field name="name">IVA 8% VENTAS</field>
|
||||
<field name="description">IVA 8%</field>
|
||||
<field name="amount">8</field>
|
||||
<field name="amount_type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
@@ -444,7 +846,6 @@
|
||||
<field name="tax_exigibility">on_payment</field>
|
||||
<field name="cash_basis_transition_account_id" ref="cuenta209_01"/>
|
||||
<field name="l10n_mx_tax_type">Tasa</field>
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
|
||||
(0,0, {
|
||||
'factor_percent': 100,
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
</group>
|
||||
|
||||
<field name="show_productions" invisible="1"/>
|
||||
<field name="immediate_production_line_ids" nolabel="1" attrs="{'invisible': [('show_productions', '=', False)]}">>
|
||||
<field name="immediate_production_line_ids" nolabel="1" attrs="{'invisible': [('show_productions', '=', False)]}">
|
||||
<tree create="0" delete="0" editable="top">
|
||||
<field name="production_id"/>
|
||||
<field name="to_immediate" widget="boolean_toggle"/>
|
||||
|
||||
@@ -342,6 +342,10 @@ img, .media_iframe_video, .o_image {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
&:has(a) {
|
||||
color: $primary;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ class Project(models.Model):
|
||||
def _compute_warning_employee_rate(self):
|
||||
projects = self.filtered(lambda p: p.allow_billable and p.allow_timesheets and p.bill_type == 'customer_project' and p.pricing_type == 'employee_rate')
|
||||
tasks = projects.task_ids.filtered(lambda t: not t.non_allow_billable)
|
||||
employees = self.env['account.analytic.line'].read_group([('task_id', 'in', tasks.ids), ('non_allow_billable', '=', False)], ['employee_id', 'project_id'], ['employee_id', 'project_id'], ['employee_id', 'project_id'], lazy=False)
|
||||
employees = self.env['account.analytic.line'].read_group([('task_id', 'in', tasks.ids), ('non_allow_billable', '=', False)], ['employee_id', 'project_id'], ['employee_id', 'project_id'], lazy=False)
|
||||
dict_project_employee = defaultdict(list)
|
||||
for line in employees:
|
||||
dict_project_employee[line['project_id'][0]] += [line['employee_id'][0]] if line['employee_id'] else []
|
||||
|
||||
@@ -7,6 +7,7 @@ from unittest.mock import patch
|
||||
|
||||
from flectra import http
|
||||
from flectra.tests import common, tagged
|
||||
from flectra.tools import mute_logger
|
||||
from flectra.tools.misc import get_lang
|
||||
from flectra.addons.web.controllers.main import ExportXlsxWriter
|
||||
from flectra.addons.mail.tests.common import mail_new_test_user
|
||||
@@ -412,3 +413,38 @@ class TestComputedBinaryExport(XlsxCreatorCase):
|
||||
['FlectraBot (1)'],
|
||||
["['computed value']"],
|
||||
])
|
||||
|
||||
@mute_logger('flectra.addons.web.controllers.main')
|
||||
def test_export_with_deleted_field(self):
|
||||
model = self.env['ir.model']._get('res.partner')
|
||||
url = '/web/export/namelist'
|
||||
header = {"Content-Type": "application/json"}
|
||||
|
||||
custom_field = self.env['ir.model.fields'].create([{
|
||||
'name': 'x_test',
|
||||
'ttype': 'char',
|
||||
'field_description': 'test field',
|
||||
'model_id': model.id,
|
||||
}])
|
||||
|
||||
export_template = self.env['ir.exports'].create({
|
||||
'name': custom_field.name,
|
||||
'export_fields': [(0, 0, {'name': custom_field.name})],
|
||||
})
|
||||
|
||||
data = json.dumps({
|
||||
'params': {
|
||||
'model': model.model,
|
||||
'export_id': export_template.id,
|
||||
},
|
||||
})
|
||||
|
||||
export_line_field = self.env['ir.exports.line'].search([('name', '=', export_template.name)])
|
||||
|
||||
self.url_open(url, data, headers=header).json()
|
||||
self.assertTrue(export_line_field.exists())
|
||||
|
||||
custom_field.unlink()
|
||||
|
||||
self.url_open(url, data, headers=header).json()
|
||||
self.assertFalse(export_line_field.exists())
|
||||
|
||||
@@ -1807,7 +1807,15 @@ class Export(http.Controller):
|
||||
def namelist(self, model, export_id):
|
||||
# TODO: namelist really has no reason to be in Python (although itertools.groupby helps)
|
||||
export = request.env['ir.exports'].browse([export_id]).read()[0]
|
||||
export_fields_list = request.env['ir.exports.line'].browse(export['export_fields']).read()
|
||||
exported_fields = request.env['ir.exports.line'].browse(export['export_fields'])
|
||||
fields = self.fields_get(model)
|
||||
|
||||
for invalid_fields in exported_fields.filtered(lambda f: f.name not in fields):
|
||||
# ir.exports.line lack a ondelete=cascade foreign key on ir.model.fields
|
||||
_logger.warning("Field %r not found for saved ir.exports of model %s, deleting", invalid_fields.name, model)
|
||||
invalid_fields.unlink()
|
||||
|
||||
export_fields_list = exported_fields.read()
|
||||
|
||||
fields_data = self.fields_info(
|
||||
model, [f['name'] for f in export_fields_list])
|
||||
|
||||
@@ -581,11 +581,11 @@ class WebsiteSale(http.Controller):
|
||||
name_change = partner_su and 'name' in data and data['name'] != partner_su.name
|
||||
email_change = partner_su and 'email' in data and data['email'] != partner_su.email
|
||||
|
||||
# Prevent changing the partner name if invoices have been issued.
|
||||
if name_change and not partner_su.can_edit_vat():
|
||||
# Prevent changing the billing partner name if invoices have been issued.
|
||||
if mode[1] == 'billing' and name_change and not partner_su.can_edit_vat():
|
||||
error['name'] = 'error'
|
||||
error_message.append(_(
|
||||
"Changing your name is not allowed once invoices have been issued for your"
|
||||
"Changing your name is not allowed once documents have been issued for your"
|
||||
" account. Please contact us directly for this operation."
|
||||
))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user