lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,905 Commits 43 Branches 150 Tags 886 MiB
a9e48a6aac
Commit Graph

2358 Commits

Author SHA1 Message Date
Laurent Destailleur
a48b032dd8
Merge pull request #21200 from leninrivas/patch-5 
Save usermodid to updatePercent
 2022-06-12 19:09:45 +02:00
Lenin Rivas
503a5cdc82
Add user who modified the percent 2022-06-12 06:33:42 -05:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Lenin Rivas
b57a9d5896
Save usermodid to updatePercent 2022-06-10 05:58:01 -05:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
Florian HENRY
70892c18c5 fix: filter status do not work on peruser action comm 2022-06-07 18:14:15 +02:00
Florian HENRY
0146be0d15 fix: filter status do not work on peruser action comm 2022-06-07 18:13:21 +02:00
stickler-ci
e48ce5b159 Fixing style errors. 2022-06-02 19:34:39 +00:00
Florian HENRY
b482a78d31 better fix 2022-06-02 21:29:27 +02:00
Florian HENRY
7f38d55648 better fix 2022-06-02 21:28:17 +02:00
stickler-ci
19dc0f124c Fixing style errors. 2022-06-02 13:37:55 +00:00
Florian HENRY
d5c4cac64b Merge branch '15_fix_actioncomm_code_not_updated' of github.com:FHenry/dolibarr into 15_fix_actioncomm_code_not_updated 2022-06-02 15:32:37 +02:00
Florian HENRY
43207429ae fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create) until we decide to remove this column 2022-06-02 15:32:16 +02:00
stickler-ci
d73982d1eb Fixing style errors. 2022-06-02 13:26:06 +00:00
Florian HENRY
f6e53b40da fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create) until we decide to remove this column 2022-06-02 15:20:00 +02:00
Laurent Destailleur
f5705e89a8
Merge branch 'develop' into patch-195 2022-06-01 22:03:19 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
65913cdd15 Fix list of event empty. 2022-06-01 13:11:36 +02:00
BENKE Charlene
35a1f9ac4b
php V8 warning 2022-05-27 16:30:26 +02:00
Laurent Destailleur
00e65eb106 Fix bad management when inserting contacts of actioncomm 2022-05-23 00:49:59 +02:00
Laurent Destailleur
3d5b322d98 Debug v16 2022-05-22 16:27:42 +02:00
Laurent Destailleur
7b4dae8773 CSS 2022-05-22 16:16:17 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
0d7386ab89 Fix select projet on event creation 2022-05-21 01:23:39 +02:00
Laurent Destailleur
09cf9e82f8 Debug v16 2022-05-19 11:47:43 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
a92974c818 Fix typo 2022-05-16 14:08:16 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
8023e1b0cd Debug v16 2022-04-30 20:41:18 +02:00
Laurent Destailleur
2e1dfc9a43 Fix method "file" for external URLs is forbidden. 2022-04-30 20:06:08 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Laurent Destailleur
631d2da6b3 Fix php8 2022-04-09 03:26:38 +02:00
Marc de Lima Lucio
6e0888ca0e FIX: action comm list: holiday last day not included + handle duration with halfdays 2022-04-07 17:17:20 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge 
can merge products
 2022-04-07 15:02:03 +02:00
Laurent Destailleur
0ed7c643f8 Close #20547 2022-04-07 13:28:24 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Laurent Destailleur
106e3072dc
Update card.php 2022-04-01 13:20:40 +02:00
Florian HENRY
e7db103b57 fix: on update with action reminder in future there is user key error 2022-03-31 18:55:54 +02:00
Laurent Destailleur
bc9ec3e2b9
Merge pull request #20395 from hregis/fix_uniformize_with_element_name 
FIX uniformize with element name "contact"
 2022-03-23 16:04:53 +01:00
Laurent Destailleur
a5e9970866 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2022-03-22 16:58:57 +01:00
Laurent Destailleur
6c0e333c7d Fix we must user relative timezone of date. 2022-03-20 16:33:35 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00