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

67370 Commits

Author SHA1 Message Date
Laurent Destailleur
fe89e158fe Fix: Avoid deletion of system entries in dictionary 2019-07-19 04:03:33 +02:00
Laurent Destailleur
6c3a30e872 Fix log 2019-07-19 03:05:55 +02:00
Laurent Destailleur
58428cefc0 Fix phpcs 2019-07-18 18:53:51 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
5e204f0f67 Merge 2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
ad4267abfb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-18 17:47:11 +02:00
Laurent Destailleur
a09d33b427 Fix responsive 2019-07-18 17:47:00 +02:00
Laurent Destailleur
b0baba3293
Merge pull request #11526 from atm-ph/fix_9.0_missing_hook 
Fix missing hook then can't interact with actions
 2019-07-18 17:24:08 +02:00
Laurent Destailleur
b3182f65bc
Update create.php 2019-07-18 17:23:52 +02:00
Laurent Destailleur
e548872133
Update prelevement.php 2019-07-18 17:23:05 +02:00
Laurent Destailleur
a20a121558
Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned 
FIX: socpeople assigned list in action com list
 2019-07-18 17:20:41 +02:00
Laurent Destailleur
747305fcc6
Merge pull request #11521 from altatof/jsonprices10 
FIX : do not return formatted prices in json string
 2019-07-18 17:18:13 +02:00
Laurent Destailleur
d04a092756
Merge pull request #11525 from altatof/fournpricelog 
FIX fournrprice log for insert
 2019-07-18 17:16:04 +02:00
Laurent Destailleur
f53f314211
Update fournisseur.product.class.php 2019-07-18 17:15:50 +02:00
atm-ph
984fe98342 Fix missing hook 2019-07-18 16:12:42 +02:00
atm-ph
c961a397c4 Fix missing hook then can't interact with actions 2019-07-18 15:40:50 +02:00
Laurent Destailleur
3b393e818a Fix missing entity property into fetch 2019-07-18 14:17:29 +02:00
Laurent Destailleur
e976195777 Fix missing key for api 2019-07-18 14:08:15 +02:00
Laurent Destailleur
5f917c6f7e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-18 13:26:39 +02:00
Laurent Destailleur
29974a5fbf Fix css 2019-07-18 13:26:19 +02:00
Christophe Battarel
5daf0316f9 also fix bad insert sql command 2019-07-18 11:18:25 +02:00
Christophe Battarel
32bc8a5faf FIX fournrprice log for insert 2019-07-18 11:05:51 +02:00
John Botella
b5d348356d Fix socpeople assigned list in action com list 2019-07-17 16:49:41 +02:00
Christophe Battarel
aab23a1531 FIX : do not return formatted prices in json string 2019-07-16 17:50:43 +02: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
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
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
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
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
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