Commit Graph

95785 Commits

Author SHA1 Message Date
Cédric
01db1161b6
Update api_products.class.php 2021-03-08 13:25:31 +01:00
Cédric
15fe2a7205
indicate if the product is used 2021-03-08 13:25:01 +01:00
Cédric
5fc5d9ab48
Update api_products.class.php 2021-03-08 12:12:29 +01:00
stickler-ci
7ae57fb8d0 Fixing style errors. 2021-03-06 18:48:55 +00:00
Cédric
1f55f50d19
NEW API Get the list of product ids only 2021-03-06 19:46:30 +01:00
Laurent Destailleur
63aa2f4ec2 Fix phpunit 2021-03-06 12:50:38 +01:00
Laurent Destailleur
0a0bb92689 Fix phpcs 2021-03-06 11:37:23 +01:00
Laurent Destailleur
6b09452104 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-06 11:34:37 +01:00
Laurent Destailleur
9bba493676
Merge pull request #16509 from FHenry/develop
fix : better pk creation for civility
2021-03-06 11:27:06 +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
b42ccd896c
Merge pull request #16550 from atm-gauthier/FIX_salaries
FIX : several bugs on salaries + id salary in payments list
2021-03-06 11:17:04 +01:00
Laurent Destailleur
4c842e8d6d
Merge pull request #16542 from frederic34/patch-3
Update pre-commit
2021-03-06 11:14:57 +01:00
Laurent Destailleur
db0e3dd180 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-06 11:10:43 +01:00
Laurent Destailleur
387c016287
Merge pull request #16547 from frederic34/patch-4
FIX #16544
2021-03-06 11:09:38 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter
NEW: LDAP: usergroup search can be filtered
2021-03-06 11:08:24 +01:00
Laurent Destailleur
aa06744aeb
Merge pull request #16549 from Hystepik/develop#3
Fix #16524 : Add support disassemble BOM
2021-03-06 11:06:54 +01:00
Laurent Destailleur
0816cb9c04
Merge pull request #16560 from code-chicken/patch-12
Don't discard previously collected data
2021-03-06 10:57:18 +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
150cb052d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-06 10:48:22 +01:00
Laurent Destailleur
08b761d15f
Merge pull request #16555 from dolibit-ut/patch-71
Update CONTRIBUTING.md
2021-03-06 10:43:43 +01:00
Laurent Destailleur
a8c7579efd
Merge pull request #16565 from devicemxl/develop
Accounting charts used in Mexico
2021-03-06 10:43:10 +01:00
Laurent Destailleur
56cbf04e77
Update llx_accounting_abc.sql 2021-03-06 10:43:01 +01:00
Laurent Destailleur
c97f0b2278
Merge pull request #16568 from frederic34/patch-8
doxygen
2021-03-06 10:40:51 +01:00
Laurent Destailleur
7959bc99d7 Fix phpcs 2021-03-06 10:39:51 +01:00
Frédéric FRANCE
5d1b231f0a
doxygen 2021-03-06 09:35:18 +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
371b3915d3
Merge pull request #1 from devicemxl/devicemxl-patch-1
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 14:12:59 -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
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
Laurent Destailleur
f328e08bd9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
2021-03-05 18:30:19 +01:00
Laurent Destailleur
98c7814fa3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
Laurent Destailleur
3cfcad284b Fix unsubscribe to MLs 2021-03-05 17:48:55 +01:00
Laurent Destailleur
1cd822bd75 Fix DOS attack on emailings wrappers 2021-03-05 14:54:17 +01: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
Rüdiger Hahn
18fc169cd0
Don't discard previously collected data
For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one.
2021-03-05 11:32:03 +01:00
stickler-ci
06cabb35ec Fixing style errors. 2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
396fb3fae3 FIX: ldap: bad function comment 2021-03-05 11:21:04 +01:00
Marc de Lima Lucio
25b1469b54 FIX: ldap group search test: bad key used + edit label/comments + remove useless code 2021-03-05 11:18:51 +01:00
Marc de Lima Lucio
f731545af4 NEW: ldap: filter search on usergroups 2021-03-05 11:14:21 +01:00
UT from dolibit
4f1ec058bf
Update CONTRIBUTING.md 2021-03-05 11:03:22 +01:00
Gauthier PC portable 024
dd83363392 FIX : several bugs on salaries + id salary in payments list 2021-03-05 10:15:35 +01:00
Laurent Destailleur
83df996bc2 Fix english translation 2021-03-05 09:52:25 +01:00
stickler-ci
ebf92ba440 Fixing style errors. 2021-03-05 08:50:49 +00:00
lmarcouiller
c00d64855a Fix #16524 : Add support disassemble BOM 2021-03-05 09:47:38 +01:00
Frédéric FRANCE
d13ed6bdfb
Update consumption.php 2021-03-05 08:44:29 +01:00
Christophe Battarel
acb8741849 fix typo 2021-03-05 08:40:26 +01:00