2
0
forked from Wavyzz/dolibarr
Commit Graph

200 Commits

Author SHA1 Message Date
Laurent Destailleur
cbd99ea7a2 FIX #14088 2020-06-16 21:57:49 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
7145754376 Can set different warehous, lot during production 2020-03-22 17:06:59 +01:00
Laurent Destailleur
425d2afc4b Rename js into js.php. Fix some labels 2020-03-22 12:31:27 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
2ad483413e Better place to force the default warehouse 2019-12-19 12:05:34 +01:00
stickler-ci
2f41a53bb4 Fixing style errors. 2019-12-19 10:38:19 +00:00
Laurent Destailleur
0f30e6f73b Update dispatch.php 2019-12-19 11:35:50 +01:00
Laurent Destailleur
a71f0e3472 Merge branch 'develop' into fourn 2019-12-19 11:35:02 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Laurent Destailleur
52e90a8d91 Update dispatch.php 2019-11-08 11:38:08 +01:00
altairis
c574f5990f add constant DISPATCH_FORCE_QTY_INPUT 2019-11-07 14:31:30 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
b2b057e9b5 clean indent 2019-10-27 09:51:15 +01:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
altairis
8b8a5e315a fix test error 2019-10-04 10:55:09 +02:00
altairis
55c0913884 Merge branch 'develop' into fourn 2019-10-04 10:51:28 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
16484e1fa3 Fix balance of td 2019-09-06 02:22:44 +02:00
Christophe Battarel
754897604f merge develop 2019-09-05 15:47:58 +02:00
Christophe Battarel
0bf70dddc7 actualize from develop 2019-09-05 15:33:16 +02:00
Christophe Battarel
dff36c9d68 actualize from develop 2019-09-05 15:30:14 +02:00
Christophe Battarel
7c3e643fca fix PSR2 missing space 2019-08-22 16:07:18 +02:00
Laurent Destailleur
aba9eafeea Update dispatch.php 2019-07-30 21:42:53 +02:00
Juanjo Menent
38bb046abb NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order 2019-07-26 12:38:49 +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
atm-florian.m
8aa147a4e5 # missing hooks from dispatch.php and list.php 2019-07-15 11:59:22 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/comm/action/card.php
2019-07-04 12:22:40 +02:00
atm-florian.m
3e53a06b2e minor spelling issues 2019-07-03 16:17:47 +02:00
Laurent Destailleur
a1f0df9a30 Debug receipt module 2019-05-09 17:45:16 +02:00
Christophe Battarel
ed12b1855c change entrepot to warehouse 2019-05-01 13:55:27 +02:00
Christophe Battarel
9999ae05cc add default warehouse 2019-05-01 11:10:11 +02:00
Frédéric FRANCE
d96cc53f97 replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
Laurent Destailleur
cdf85b0d00 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-23 16:02:35 +01:00
Laurent Destailleur
0081d3c25d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-23 16:02:10 +01:00
Francis Appels
c38b0c4dbe FIX fk_default_warehouse missing in group by 2019-02-22 12:17:34 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
atm-quentin
96d0bb8f2e FIX adapt develop 2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00