audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
525 Commits 170 Branches 0 Tags
17d69bb77e73e19fd44e63f55daff3a086565a7c
Commit Graph

525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jared Kipe
5739d29466 [IMP] pos_pax: implement low level and UI for Debit cards. 2020-12-29 11:01:49 -08:00
Jared Kipe
168926739f Merge branch 'imp/11.0/delivery_stamps__better_zip_handling' into '11.0' 
imp/11.0/delivery_stamps__better_zip_handling into 11.0

See merge request hibou-io/hibou-odoo/suite!745
 2020-12-28 20:01:19 +00:00
Hibou Bot
a7830cf9a0 Merge branch 'imp/11.0/delivery_stamps__better_zip_handling' into '11.0-test' 
imp/11.0/delivery_stamps__better_zip_handling into 11.0-test

See merge request hibou-io/hibou-odoo/suite!744
 2020-12-28 19:59:23 +00:00
Jared Kipe
b0464af565 [IMP] delivery_stamps: split ZIP codes for 'addon' 2020-12-28 11:58:14 -08:00
Jared Kipe
a557a3cb09 Merge branch 'imp/11.0/docker' into '11.0' 
imp/11.0/docker into 11.0

See merge request hibou-io/hibou-odoo/suite!716
 2020-12-03 23:34:47 +00:00
Jared Kipe
db229885ec Merge branch 'imp/11.0/docker' into 11.0-test 2020-12-03 14:39:02 -08:00
Jared Kipe
5d0fe47092 Backport gitlab-ci, Dockerfile, and entrypoint from 13.0 2020-12-03 14:19:16 -08:00
Jared Kipe
c9d4148694 Merge branch 'imp/11.0/docker' into 11.0-test 2020-12-03 13:19:27 -08:00
Jared Kipe
47eb650da8 Backport gitlab-ci, Dockerfile, and entrypoint from 13.0 2020-12-03 13:18:58 -08:00
Jared Kipe
d97156a914 Merge branch '11.0' into 11.0-test 
# Conflicts:
#	l10n_us_hr_payroll/data/state/ak_alaska.xml
#	l10n_us_hr_payroll/data/state/al_alabama.xml
#	l10n_us_hr_payroll/data/state/ar_arkansas.xml
#	l10n_us_hr_payroll/data/state/az_arizona.xml
#	l10n_us_hr_payroll/data/state/ca_california.xml
#	l10n_us_hr_payroll/data/state/co_colorado.xml
#	l10n_us_hr_payroll/data/state/ct_connecticut.xml
#	l10n_us_hr_payroll/data/state/de_delaware.xml
#	l10n_us_hr_payroll/data/state/hi_hawaii.xml
#	l10n_us_hr_payroll/data/state/ia_iowa.xml
#	l10n_us_hr_payroll/data/state/id_idaho.xml
#	l10n_us_hr_payroll/data/state/il_illinois.xml
#	l10n_us_hr_payroll/data/state/ks_kansas.xml
#	l10n_us_hr_payroll/data/state/ky_kentucky.xml
#	l10n_us_hr_payroll/data/state/me_maine.xml
#	l10n_us_hr_payroll/data/state/mi_michigan.xml
#	l10n_us_hr_payroll/data/state/mn_minnesota.xml
#	l10n_us_hr_payroll/data/state/mo_missouri.xml
#	l10n_us_hr_payroll/data/state/nc_northcarolina.xml
#	l10n_us_hr_payroll/data/state/nd_north_dakota.xml
#	l10n_us_hr_payroll/data/state/ne_nebraska.xml
#	l10n_us_hr_payroll/data/state/nj_newjersey.xml
#	l10n_us_hr_payroll/data/state/nm_new_mexico.xml
#	l10n_us_hr_payroll/data/state/nv_nevada.xml
#	l10n_us_hr_payroll/data/state/ok_oklahoma.xml
#	l10n_us_hr_payroll/data/state/ri_rhode_island.xml
#	l10n_us_hr_payroll/data/state/sc_south_carolina.xml
#	l10n_us_hr_payroll/data/state/ut_utah.xml
#	l10n_us_hr_payroll/data/state/vt_vermont.xml
#	l10n_us_hr_payroll/data/state/wv_west_virginia.xml
#	l10n_us_hr_payroll/models/__init__.py
#	l10n_us_hr_payroll/models/federal/fed_941.py
#	l10n_us_hr_payroll/models/hr_payslip.py
#	l10n_us_hr_payroll/tests/test_special.py
 2020-11-21 15:43:12 -08:00
Jared Kipe
b7213bc1f1 [REL] l10n_us_hr_payroll: For Odoo 2020.2.2 
This release fixes multiple logical problems with Odoo's payroll, including the difference in behavior on payslips with 'recursive' category calculations needed for many.
 2020-11-21 15:41:27 -08:00
Jared Kipe
6385043f4f Merge branch 'new/11.0/pos_pax' into '11.0' 
new/11.0/pos_pax into 11.0

See merge request hibou-io/hibou-odoo/suite!684
 2020-11-21 13:45:42 +00:00
Jared Kipe
598ae136d6 Merge branch 'new/11.0/pos_pax' into 11.0-test 
# Conflicts:
#	pos_pax/__init__.py
#	pos_pax/models/__init__.py
 2020-11-20 15:04:51 -08:00
Jared Kipe
2b918595a6 [ADD] pos_pax: for Odoo 11.0 2020-11-20 14:36:00 -08:00
Hibou Bot
24cdca33d2 Merge branch 'new/11.0/pos_pax' into '11.0-test' 
new/11.0/pos_pax into 11.0-test

See merge request hibou-io/hibou-odoo/suite!683
 2020-11-20 22:25:55 +00:00
Jared Kipe
736483fe5e [ADD] pos_pax: for Odoo 11.0 2020-11-20 14:24:53 -08:00
Jared Kipe
ae794f2703 Merge branch 'new/11.0-test-professional/hibou_professional' into 11.0 2020-11-20 14:06:24 -08:00
Jared Kipe
be06fbf2af Merge branch 'new/11.0-test-professional/hibou_professional' into 11.0-test 2020-11-20 11:37:28 -08:00
Jared Kipe
2f0e3700a1 [IMP] hibou_professional: correct icon and help link. 2020-11-20 11:35:51 -08:00
Jared Kipe
1d45945d73 Merge branch 'fix/11.0/connector_magento__sol_discount_m1' into '11.0' 
fix/11.0/connector_magento__sol_discount_m1 into 11.0

See merge request hibou-io/hibou-odoo/suite!592
 2020-11-04 22:21:39 +00:00
Hibou Bot
ffdcb0a589 Merge branch 'fix/11.0/connector_magento__sol_discount_m1' into '11.0-test' 
fix/11.0/connector_magento__sol_discount_m1 into 11.0-test

See merge request hibou-io/hibou-odoo/suite!591
 2020-11-04 22:19:48 +00:00
Jared Kipe
0f21501541 [FIX] connector_magento: sale order line discount compatibility with M1 2020-11-04 14:18:43 -08:00
Jared Kipe
4961c664f3 Merge branch 'new/11.0/pos_elavon' into '11.0' 
new/11.0/pos_elavon into 11.0

See merge request hibou-io/hibou-odoo/suite!531
 2020-10-29 20:06:56 +00:00
Hibou Bot
2fd2e1e2df Merge branch 'new/11.0/pos_elavon' into '11.0-test' 
new/11.0/pos_elavon into 11.0-test

See merge request hibou-io/hibou-odoo/suite!530
 2020-10-29 19:55:13 +00:00
Jared Kipe
d59379fb6c [MOV] pos_elavon: from hibou-suite-enterprise:11.0 2020-10-29 12:53:59 -07:00
Jared Kipe
fdfc7a47e2 Merge branch 'new/11.0/delivery_fedex_hibou' into '11.0' 
new/11.0/delivery_fedex_hibou into 11.0

See merge request hibou-io/hibou-odoo/suite!529
 2020-10-29 19:48:48 +00:00
Hibou Bot
522535fbbc Merge branch 'new/11.0/delivery_fedex_hibou' into '11.0-test' 
new/11.0/delivery_fedex_hibou into 11.0-test

See merge request hibou-io/hibou-odoo/suite!528
 2020-10-29 19:41:14 +00:00
Jared Kipe
0e5166965e [MOV] delivery_fedex_hibou: from hibou-suite-enterprise:11.0 2020-10-29 12:40:01 -07:00
Jared Kipe
d7234aebe3 Merge branch 'new/11.0/delivery_gso' into '11.0' 
new/11.0/delivery_gso into 11.0

See merge request hibou-io/hibou-odoo/suite!527
 2020-10-29 19:38:29 +00:00
Hibou Bot
477c71bf40 Merge branch 'new/11.0/delivery_gso' into '11.0-test' 
new/11.0/delivery_gso into 11.0-test

See merge request hibou-io/hibou-odoo/suite!526
 2020-10-29 18:44:44 +00:00
Jared Kipe
ffba0742f7 [MOV] delivery_gso: from hibou-suite-enterprise:11.0 2020-10-29 11:43:43 -07:00
Jared Kipe
665fa7a910 Merge branch 'new/11.0/helpdesk_sales' into '11.0' 
new/11.0/helpdesk_sales into 11.0

See merge request hibou-io/hibou-odoo/suite!525
 2020-10-29 18:30:38 +00:00
Hibou Bot
8412e26f56 Merge branch 'new/11.0/helpdesk_sales' into '11.0-test' 
new/11.0/helpdesk_sales into 11.0-test

See merge request hibou-io/hibou-odoo/suite!524
 2020-10-29 18:27:01 +00:00
Jared Kipe
0580b75bd8 [MOV] helpdesk_sales: from hibou-suite-enterprise:11.0 2020-10-29 11:25:45 -07:00
Jared Kipe
20ac907e6c Merge branch 'new/11.0/helpdesk_rma' into '11.0' 
new/11.0/helpdesk_rma into 11.0

See merge request hibou-io/hibou-odoo/suite!523
 2020-10-29 18:23:56 +00:00
Hibou Bot
379ff3ba14 Merge branch 'new/11.0/helpdesk_rma' into '11.0-test' 
new/11.0/helpdesk_rma into 11.0-test

See merge request hibou-io/hibou-odoo/suite!522
 2020-10-29 18:21:11 +00:00
Jared Kipe
c125335b29 [MOV] helpdesk_rma: from hibou-suite-enterprise:11.0 2020-10-29 11:20:02 -07:00
Jared Kipe
750e13cf46 Merge branch 'fix/11.0/connector_magento__sol_price_m1' into '11.0' 
fix/11.0/connector_magento__sol_price_m1 into 11.0

See merge request hibou-io/hibou-odoo/suite!482
 2020-10-02 19:13:16 +00:00
Hibou Bot
d405ff6aff Merge branch 'fix/11.0/connector_magento__sol_price_m1' into '11.0-test' 
fix/11.0/connector_magento__sol_price_m1 into 11.0-test

See merge request hibou-io/hibou-odoo/suite!481
 2020-10-02 19:11:25 +00:00
Jared Kipe
0b910fa40d [FIX] connector_magento: bump submodule 2020-10-02 12:10:13 -07:00
Jared Kipe
8deb11c22b [FIX] menu dissapears on click in certain elements. production endpiont. 2020-09-29 12:08:40 -07:00
Jared Kipe
70876cd0c5 Merge branch 'imp/11.0/connector_magento2' into '11.0' 
imp/11.0/connector_magento2 into 11.0

See merge request hibou-io/hibou-odoo/suite!371
 2020-09-24 00:32:20 +00:00
Hibou Bot
bf3a8d6a2f Merge branch 'imp/11.0/l10n_us_hr_payroll__backports' into '11.0-test' 
imp/11.0/l10n_us_hr_payroll__backports into 11.0-test

See merge request hibou-io/hibou-odoo/suite!441
 2020-08-26 18:11:48 +00:00
Bhoomi Vaishnani
efd66beb73 [IMP] l10n_us_hr_payroll : All States For Odoo 11.0 2020-08-26 14:10:44 -04:00
Jared Kipe
ae06e790a5 Merge branch 'fix/11.0/l10n_us_hr_payroll__ca_mig_2020' into '11.0' 
fix/11.0/l10n_us_hr_payroll__ca_mig_2020 into 11.0

See merge request hibou-io/hibou-odoo/suite!429
 2020-08-05 16:22:01 +00:00
Hibou Bot
7a62538212 Merge branch 'fix/11.0/l10n_us_hr_payroll__ca_mig_2020' into '11.0-test' 
fix/11.0/l10n_us_hr_payroll__ca_mig_2020 into 11.0-test

See merge request hibou-io/hibou-odoo/suite!428
 2020-08-05 16:20:32 +00:00
Jared Kipe
8a942bb8e8 [FIX] l10n_us_hr_payroll: CA migration field name and 'exempt' value. 5e66eb4 Jared Kipe <jared@hibou.io> Aug 5, 2020 at 9:11 AM 2020-08-05 09:19:22 -07:00
Hibou Bot
340dd79712 Merge branch 'imp/11.0/connector_magento2' into '11.0-test' 
imp/11.0/connector_magento2 into 11.0-test

See merge request hibou-io/hibou-odoo/suite!370
 2020-06-18 18:25:15 +00:00
Jared Kipe
069fe6543c [IMP] connector_magento: bump submodule for magento2 compat 2020-06-18 11:24:01 -07:00
Jared Kipe
912fd2f786 Merge branch 'imp/11.0/sale_planner__transit_calc' into '11.0' 
imp/11.0/sale_planner__transit_calc into 11.0

See merge request hibou-io/hibou-odoo/suite!355
 2020-05-28 17:31:11 +00:00