Commit Graph

109905 Commits

Author SHA1 Message Date
atm-greg
8213756c37 fix sql to avoid getting product_stock of another product with same batch 2022-05-24 16:49:55 +02:00
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
2022-05-24 16:31:45 +02:00
Laurent Destailleur
ab40634dcb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-05-24 16:28:32 +02:00
Laurent Destailleur
c1ef208c0f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/lib/security.lib.php
	htdocs/expensereport/card.php
2022-05-24 16:27:26 +02:00
Laurent Destailleur
e3aa26e5c2 Fix creation of primary key 2022-05-24 16:10:33 +02:00
Laurent Destailleur
1a23143394 Fix autoincrement column 2022-05-24 16:02:37 +02:00
stickler-ci
f0fa315a7b Fixing style errors. 2022-05-24 13:24:31 +00:00
jpb
52b23c748c change same left menu name on GRH top menu 2022-05-24 15:13:22 +02:00
kamel
79462c43fa FIX: Fix get origin from other than supplier proposal when add a new supplier proposal 2022-05-24 15:13:19 +02:00
kamel
192f273e27 FIX: Fix show errors in card 2022-05-24 15:02:35 +02:00
Laurent Destailleur
536f888ba2 Fix search hook in takepos 2022-05-24 12:59:27 +02:00
Laurent Destailleur
b8764c4804 Doc 2022-05-24 12:48:48 +02:00
Laurent Destailleur
5534284d9b css 2022-05-24 12:36:11 +02:00
Laurent Destailleur
58d82841e3 css 2022-05-24 12:11:51 +02:00
Laurent Destailleur
43be070300 PHP8.1 strftime("%Y%m%d%H%M") => dol_print_date(dol_now('gmt'),
"dayhourlogsmall", 'tzuser')
2022-05-24 11:55:21 +02:00
Laurent Destailleur
30e300fbc8 FIX Remove warning during dump 2022-05-24 11:52:55 +02:00
atm-orian
e8ed75cac3 redirection OF avec des enfants par Orian 2022-05-24 11:34:39 +02:00
atm-lena
eba84382dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-05-24 09:37:39 +02:00
jpb
a4c5ba7239 Merge branch 'NEW/ExpenseReport_ik_add' of github.com:atm-jpb/dolibarr into NEW/ExpenseReport_ik_add 2022-05-24 09:07:25 +02:00
jpb
851b9e6cdd revamp sql 2022-05-24 09:06:57 +02:00
stickler-ci
d425e14d0d Fixing style errors. 2022-05-24 06:26:08 +00:00
jpb
c546f105fa Merge branch 'NEW/ExpenseReport_ik_add' of github.com:atm-jpb/dolibarr into NEW/ExpenseReport_ik_add 2022-05-24 08:20:08 +02:00
jpb
23cd63963a add the annual accumulation of mileage costs for the selection of the coefficient 2022-05-24 08:15:28 +02:00
Alexandre SPANGARO
c5bbbd88af Merge problem 2022-05-24 07:14:22 +02:00
Eric Seigne
dce6271f23 burundi : add vat rates 2022-05-23 23:23:02 +02:00
BENKE Charlene
9b50b63850
FIX PHP V8 warning
$sameunits not initialy defined
no default_lang needed (and field not present on stock class
2022-05-23 21:58:29 +02:00
Alexandre SPANGARO
e437a53657 Typo 2022-05-23 21:40:47 +02:00
stickler-ci
d8f0e42c67 Fixing style errors. 2022-05-23 19:28:28 +00:00
BENKE Charlene
977f77cc18
$note_private getpost need 2022-05-23 21:22:34 +02:00
BENKE Charlene
32202d8704
FIX V8 : warning if $objectsrc not defined 2022-05-23 21:18:42 +02:00
BENKE Charlene
3058d6ff0b
FIX : bad object name 2022-05-23 20:41:22 +02:00
Ilias Patsiaouras
3519138110 add option to parse extrafield (options_) in emailcollector 2022-05-23 20:26:08 +02:00
stickler-ci
c2277a644b Fixing style errors. 2022-05-23 18:08:49 +00:00
Laurent Destailleur
eaa0170604 Trans 2022-05-23 20:05:30 +02:00
jpb
6f0047cc77 stickler fix 2022-05-23 20:03:08 +02:00
jpb
dd5650025f fix stickler 2022-05-23 20:01:19 +02:00
jpb
68148c008c stickler fix 2022-05-23 19:59:54 +02:00
Laurent Destailleur
b693a2f10c Fix typo 2022-05-23 19:43:31 +02:00
ptibogxiv
8172cb5b97
Add get knowledgerecord categorie with REST API 2022-05-23 19:37:42 +02:00
jpb
68564b3b20 Merge branch 'NEW/ExpenseReport_ik_add' of github.com:atm-jpb/dolibarr into NEW/ExpenseReport_ik_add 2022-05-23 16:59:44 +02:00
jpb
381e063123 fix cast in sql 2022-05-23 16:57:25 +02:00
stickler-ci
d47715d9f5 Fixing style errors. 2022-05-23 14:55:40 +00:00
jpb
eb526afc3a add coef on input ht line expenseReport 2022-05-23 16:41:05 +02:00
Francis Appels
8574f36e35 dol_dir_list fast mode 2022-05-23 15:25:31 +02:00
Laurent Destailleur
6de1f6bbac Generic message 2022-05-23 15:12:15 +02:00
Quentin VIAL-GOUTEYRON
9ed75d01bd fix missing token on mo card 2022-05-23 12:43:30 +02:00
Quentin VIAL-GOUTEYRON
48151b47a6 FIX mvt origin 2022-05-23 12:31:37 +02:00
Gauthier PC portable 024
2cd52b6ea2 FIX : no thead and tbody on reception lines array 2022-05-23 12:24:51 +02:00
Francis Appels
71ed1ec602 Product lot document management should not use batch but ref (is lot id) 2022-05-23 12:07:37 +02:00