Commit Graph

96307 Commits

Author SHA1 Message Date
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +01:00
Florian Mortgat
c73dbebd8f
Merge pull request #169 from atm-adrien/NEW/12.0_new_payments_on_salaries_devadrien
FIX : pencil to update employee field on card view
2021-03-08 10:31:51 +01:00
lmarcouiller
f627637490 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-03-08 10:15:00 +01:00
x
55e9908601 FIX : PR returns 2021-03-08 10:09:38 +01:00
ksar
ec8baa6bff Update commondocgenerator.class.php
#16341
2021-03-08 10:00:19 +01:00
Alexandre SPANGARO
2f86971f84 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-03-08 09:56:57 +01:00
Gauthier PC portable 024
f9a1b5fd3e FIX : quote forgotten in merge 2021-03-08 09:21:03 +01:00
Laurent Destailleur
4d409e23f5 Missing declaration of properties 2021-03-08 09:16:33 +01:00
Gauthier PC portable 024
e7c030f576 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into FIX_salaries2 2021-03-08 09:16:00 +01:00
Laurent Destailleur
a1d97274fb Clean code for php8 2021-03-08 09:14:23 +01:00
Gauthier PC portable 024
ff97a41386 FIX : num_payment on llx_salary is useless 2021-03-08 09:00:52 +01:00
Frédéric FRANCE
c0c9ac439f
Update api_agendaevents.class.php 2021-03-08 00:23:05 +01:00
Frédéric FRANCE
c2c1005345
Update api_thirdparties.class.php 2021-03-08 00:17:58 +01:00
Frédéric FRANCE
45189de496
Update api_agendaevents.class.php 2021-03-08 00:16:28 +01:00
Alexandre SPANGARO
339af419bc Fix strftime 2021-03-07 21:59:28 +01:00
Laurent Destailleur
1affaa8c87 fix phpunit 2021-03-07 20:26:36 +01:00
Laurent Destailleur
1ca3e433d2 Fix phpunit 2021-03-07 19:55:09 +01:00
Laurent Destailleur
0f7085154b Fix phpunit 2021-03-07 19:47:55 +01:00
Laurent Destailleur
91245e22d4 Fix phpunit phpv8 2021-03-07 19:16:09 +01:00
Laurent Destailleur
13d0398bd2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/price.php
2021-03-07 19:07:18 +01:00
Laurent Destailleur
142f878633 Fix look and feel v13 2021-03-07 18:56:16 +01:00
Laurent Destailleur
b28a757530 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-07 18:41:24 +01:00
Laurent Destailleur
4666c7f090 Fix responsive 2021-03-07 18:41:07 +01:00
ptibogxiv
4834f5fdf4
Fix get thirdparties by barcode or email 2021-03-07 17:32:43 +01:00
Frédéric FRANCE
fee5bbf65b
fix usage of else if 2021-03-07 09:12:46 +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
Frédéric FRANCE
92754760f4
can add box on thirparties index 2021-03-06 16:38:07 +01:00
Frédéric FRANCE
d2494c77a6
Update facture-rec.class.php 2021-03-06 15:28:59 +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
e5d8267786
Merge pull request #16546 from FHenry/12.0
fix: set class attribute at right place
2021-03-06 11:18:02 +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
1ad04bb67a
Merge pull request #16548 from frederic34/patch-5
Fix #16544
2021-03-06 11:09:58 +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