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

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre SPANGARO
21bd46fc15 Merge remote-tracking branch 'upstream/develop' into 11.0_salaries 2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda NEW Extrafields on salaries 2019-07-17 14:09:25 +02:00
Laurent Destailleur
fed598236c Add field 2019-07-17 01:12:48 +02:00
Laurent Destailleur
8a74dc6206 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-17 01:12:03 +02:00
Laurent Destailleur
61a574701b New Add field prefix_session in llx_events 2019-07-17 01:11:10 +02:00
Christophe Battarel
aab23a1531 FIX : do not return formatted prices in json string 2019-07-16 17:50:43 +02:00
Laurent Destailleur
2c0c5a505f
Merge pull request #11351 from rycks/tvaPrint 
Update print VAT document: remove form part and add right title
 2019-07-16 17:18:07 +03:00
Laurent Destailleur
b9771db131
Fix phpcs 2019-07-16 17:16:49 +03:00
Laurent Destailleur
a3b746bcb9
Merge pull request #11517 from hregis/9.0_bug2 
FIX better compatibility with Multicompany
 2019-07-16 17:10:47 +03:00
Laurent Destailleur
77300e1210
Merge pull request #11518 from ATM-Marc/FIX_9.0_propal_clone_hook 
FIX: propal createFrom hook: undefined parameter attached
 2019-07-16 17:04:53 +03:00
Laurent Destailleur
a03a8da2fd
Merge pull request #11519 from atm-gauthier/8.0_fix_addline_cmdfourn_qty_inf_0 
FIX : we need to be able to add freeline with qty between 0 & 1 in su…
 2019-07-16 17:02:59 +03:00
gauthier
c72a59ad36 FIX : we need to be able to add freeline with qty between 0 & 1 in supplierorder line 2019-07-16 14:55:19 +02:00
Marc de Lima Lucio
464bda996c FIX: propal createFrom hook: undefined parameter attached 2019-07-16 13:59:00 +02:00
Laurent Destailleur
917799914e
Merge pull request #11433 from atm-florianm/FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set 
FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set
 2019-07-16 13:52:50 +03:00
Regis Houssin
c9fe91138d FIX better compatibility with Multicompany 2019-07-16 12:39:43 +02:00
Laurent Destailleur
617d10bf2a
Merge pull request #11512 from atm-florianm/9.0_FIX_missing-hooks-in-supplier-product-list-and-supplier-product-dispatch 
9.0 fix missing hooks in supplier product list and supplier product dispatch
 2019-07-16 13:27:53 +03:00
Laurent Destailleur
de2c189138
Merge pull request #11516 from atm-john/9.0_fix_fourn_code_preload 
FIX The proposed new supplier code does not work
 2019-07-16 13:25:41 +03:00
John Botella
70ff806fdf fix fourn code preload 2019-07-16 10:46:58 +02:00
Laurent Destailleur
f44182c89f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-16 00:13:52 +02:00
Laurent Destailleur
f826e9631c FIX #11463 2019-07-16 00:12:22 +02:00
Laurent Destailleur
fb5af65f4d FIX #11466 2019-07-15 23:56:05 +02:00
Laurent Destailleur
5d74c81941 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-15 23:48:40 +02:00
Laurent Destailleur
d694360c66 Fix warning 2019-07-15 23:46:54 +02:00
Laurent Destailleur
ea349de081 FIX #11498 2019-07-15 23:25:42 +02:00
Laurent Destailleur
6c23154a91 FIX #11506 2019-07-15 22:59:18 +02:00
Laurent Destailleur
cf00ae971a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-15 22:45:29 +02:00
Laurent Destailleur
e396824133 FIX #11507 2019-07-15 19:08:57 +02:00
Laurent Destailleur
5778a02ee1 FIX #11505 2019-07-15 18:44:33 +02:00
Laurent Destailleur
b0d46d492f FIX #11509 2019-07-15 18:40:42 +02:00
Laurent Destailleur
41d9e93b3f
Merge pull request #11510 from hregis/9.0_bug2 
FIX avoid conflict with "$classname" in card.php
 2019-07-15 17:03:24 +03:00
Florian Mortgat
b155fdc014 FIX: wrong display (and hidden input) for already dispatched quantity 2019-07-15 12:00:06 +02:00
atm-florian.m
75ae611f9e FIX: calculation of $products_dispatched 
After the DB retrieval method was changed from fetch_row to fetch_object, the indices used became wrong.
 2019-07-15 12:00:06 +02:00
atm-florian.m
8aa147a4e5 # missing hooks from dispatch.php and list.php 2019-07-15 11:59:22 +02:00
atm-florian.m
ae540cb25e FIX: add missing hook calls 2019-07-15 11:59:22 +02:00
Regis Houssin
294bc5dcb5 FIX avoid conflict with "$classname" in card.php 2019-07-15 10:19:06 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e1d4917704 FIX Missing field "Conciliated" into bank transaction export 2019-07-14 00:39:42 +02:00
Laurent Destailleur
251d501c8e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-14 00:32:46 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85 Fix save of doc template for recuring invoices. 2019-07-14 00:10:15 +02:00
Laurent Destailleur
8090a8abb6 Fix param [] -> null 2019-07-14 00:07:27 +02:00
Laurent Destailleur
39e77dbdc6
Merge pull request #11461 from ATM-Nicolas/fix_template_invoice_edit_modelpdf 
FIX : We must save code instead of value in database…
 2019-07-14 00:19:13 +03:00
Laurent Destailleur
5ccb397af9
Merge pull request #11473 from hregis/9.0_security 
FIX better compatibility with multicompany transverse mode
 2019-07-13 23:42:36 +03:00
Laurent Destailleur
9409c9e246
Merge pull request #11464 from OPEN-DSI/new-api-contacts-setcategories 
NEW Add a category to a contact in API
 2019-07-13 23:41:56 +03:00
Laurent Destailleur
f285bed2ff
Merge pull request #11479 from atm-gauthier/8.0_fix_report_by_tva 
FIX : accounting mode must be taken from global conf, because there's…
 2019-07-13 23:40:15 +03:00
Laurent Destailleur
b6571d9fc3
Update byratecountry.php 2019-07-13 22:39:25 +02:00
Laurent Destailleur
5446fe9e23
Merge pull request #11468 from frederic34/patch-7 
Update ihm.php
 2019-07-13 23:36:36 +03:00
Laurent Destailleur
edd51bb150
Merge pull request #11469 from atm-maxime/fix_prelevement_rum 
Fix : use RUM if defined in bank account
 2019-07-13 23:34:31 +03:00