Commit Graph

5988 Commits

Author SHA1 Message Date
Laurent Destailleur
8192349320 Fix migration 2021-03-10 16:49:42 +01:00
Laurent Destailleur
2e4a4b527b Fix migration 2021-03-10 16:45:28 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Laurent Destailleur
514a9fb96a Merge pull request #16561 from Hystepik/develop#1
Close #15917 : Improvement to ticket module
2021-03-10 15:49:20 +01:00
ksar
429992ee7f FIX #16590 2021-03-09 10:46:11 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
2021-03-08 19:31:47 +01:00
Laurent Destailleur
28c04a684f Fix position of field 2021-03-08 19:09:02 +01:00
lmarcouiller
b71a8c5d6f Close #15917 : boxes on ticket index 2021-03-08 15:26:35 +01:00
lmarcouiller
8c7764ed5d Move of 2 graph in boxes 2021-03-08 12:18:55 +01:00
Laurent Destailleur
c483ad5dda Merge branch 'develop' into develop 2021-03-06 11:25:52 +01:00
Laurent Destailleur
315e66aa5a Merge pull request #16537 from altairisfr/pr_sn_unicity
Unique serial number management
2021-03-06 11:22:44 +01:00
Laurent Destailleur
74d20e1b1f Merge pull request #16557 from atm-gauthier/NEW_vatmigration
NEW : sql migration from llx_tva to llx_payment_vat
2021-03-06 10:50:59 +01:00
Laurent Destailleur
3ac9829a14 Update 13.0.0-14.0.0.sql 2021-03-06 10:50:27 +01:00
Laurent Destailleur
56cbf04e77 Update llx_accounting_abc.sql 2021-03-06 10:43:01 +01:00
David
ba6d2c3444 Create llx_accounting_account_mx.sql
Hi, i propose add the 'Catalogo y codigo agrupador fiscal del 2019' it's a list taken from the oficial accounts for the electronic accounting in Mexico indicated by government since 2019
And here is the 'oficial' publication: https://dof.gob.mx/nota_detalle.php?codigo=5559612&fecha=07/05/2019
2021-03-05 14:14:18 -08:00
David
fd17f80bb6 Update llx_accounting_abc.sql
Hi, i propose add the 'Catalogo y codigo agrupador fiscal del 2019' it's a list taken from the oficial accounts for the electronic accounting in Mexico indicated by government since 2019
And here is the 'oficial' publication: https://dof.gob.mx/nota_detalle.php?codigo=5559612&fecha=07/05/2019
2021-03-05 13:34:51 -08:00
Laurent Destailleur
7a193b4c87 Add index on tag. Reduce tag length 2021-03-05 14:53:13 +01:00
Gauthier PC portable 024
83fa8812f9 NEW : sql migration from llx_tva to llx_payment_vat 2021-03-05 11:41:17 +01:00
Laurent Destailleur
525d643915 Fix debug split of payment salary into salary + payment 2021-03-04 18:57:03 +01:00
Laurent Destailleur
fa03cde0a5 Better migration script 2021-03-04 18:23:29 +01:00
Laurent Destailleur
69f76d2f9d Fix migration to fill llx_salary table 2021-03-04 18:22:21 +01:00
Laurent Destailleur
b92bfb007f Merge pull request #16520 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
2021-03-04 17:06:57 +01:00
Laurent Destailleur
7d20df8054 Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
Christophe Battarel
a4dcf603ed fix repair batch stock for batch=2 2021-03-04 15:33:06 +01:00
Florian HENRY
ecd1915c0a fix sql 2021-03-04 07:45:27 +01:00
Florian HENRY
c362a16df1 fix sql 2021-03-04 07:45:02 +01:00
Florian HENRY
89bd9c4e05 fix sql 2021-03-04 07:44:31 +01:00
Florian HENRY
879e8fe5f6 fix sql 2021-03-04 07:44:00 +01:00
Florian HENRY
c682309817 migration ok 2021-03-03 20:27:55 +01:00
Florian HENRY
81f54003f6 set migration auto increment 2021-03-02 22:35:47 +01:00
Florian HENRY
c2d8dde4b1 Merge branch 'develop' of github.com:FHenry/dolibarr into develop 2021-03-02 22:33:36 +01:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Laurent Destailleur
1876cd661a Remove UK from list of european countries 2021-03-02 16:00:10 +01:00
Florian HENRY
0f51072222 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-03-02 11:01:02 +01:00
Florian HENRY
17c8a32780 fix civility createion PK 2021-03-02 11:00:16 +01:00
Laurent Destailleur
7f209f7cc7 Clean code 2021-03-02 02:55:24 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
Florian HENRY
036d1d5802 change comlumn name 2021-03-01 15:36:22 +01:00
Florian HENRY
e101ff0d6d change comlumn name 2021-03-01 15:34:02 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Florian HENRY
d5dc95d99e add status column 2021-02-27 15:36:36 +01:00
Florian HENRY
5221b59539 set correct field name as conference or booth are in actioncomm table 2021-02-27 15:34:28 +01:00
Florian HENRY
8bb0ff065a add missing column on actioncomm 2021-02-27 14:19:02 +01:00
Florian HENRY
eb17ae5fe2 fix event type select 2021-02-27 14:13:42 +01:00
Florian HENRY
5e0ca7417e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-02-27 13:16:37 +01:00
Florian HENRY
f13ef50768 set good agenda type event 2021-02-27 13:13:42 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Laurent Destailleur
338ee6563b Merge pull request #16463 from frederic34/hrm_code_syntax
code syntax hrm imports install intracommreport loan directory
2021-02-26 19:24:03 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
2021-02-26 19:23:23 +01:00