Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

1965 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
ef0c9df5ff
Merge pull request #14224 from cfoellmann/disable-eatby-sellby 
NEW Can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
 2020-09-04 12:09:30 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
Laurent Destailleur
243f59b9e9 FIX Missing transaction on PO actions 2020-08-26 17:09:45 +02:00
Laurent Destailleur
05d82a0684 FIX Error management. Do no try to approve PO if validation fails. 2020-08-24 17:07:30 +02:00
stickler-ci
8191447007 Fixing style errors. 2020-08-19 16:33:41 +02:00
Christian Foellmann
b6af4014de hide eatby, sellby dates 2020-08-19 16:33:41 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
30560397e4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-08-04 13:43:00 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Laurent Destailleur
4bacb7d48e
Update dispatch.php 2020-08-04 12:00:24 +02:00
Laurent Destailleur
fd551261bb
Update dispatch.php 2020-08-04 11:58:29 +02:00
Laurent Destailleur
dbb2e8b1ba
Update dispatch.php 2020-08-04 11:56:01 +02:00
Bahfir Abbes
8dd54e24e7
empty is more useful than 0 2020-08-03 20:42:25 +01:00
bahfir abbes
4900e85fa8 fix: reset link on supplier dispatch 2020-08-03 20:31:55 +01:00
quentin
bbfca90260 FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order 2020-08-03 11:54:26 +02:00
bahfir abbes
6d3cebfa3c fix:erroneous input id name 2020-08-01 12:54:42 +01:00
Romain DESCHAMPS
eaef99b7af second approval back in stable feature as is the setting for minimum amount 2020-07-29 13:39:38 +02:00
Romain DESCHAMPS
09bf8bea85
second approval back in stable feature as is the setting for minimum amount 2020-07-24 14:11:42 +02:00
stickler-ci
28bc001ba9 Fixing style errors. 2020-07-17 08:52:52 +00:00
Ferran Marcet
125be4271e New: ##12972 Update supplier price also when product has batch 2020-07-17 10:50:24 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
cbd99ea7a2 FIX #14088 2020-06-16 21:57:49 +02:00
Laurent Destailleur
ba1e067d32
Merge pull request #13678 from TobiasSekan/cleanupUserRightsForunCommandeCard 
Cleanup user rights forun commande card
 2020-05-28 21:12:23 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Laurent Destailleur
40777cbcd9 Fix phpcs 2020-05-23 20:11:10 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
stickler-ci
66637ba0b6 Fixing style errors. 2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
altairis
80c56b3017 manage stock on edit and delete dispatched lines 2020-05-19 15:59:03 +02:00
altairis
b79a30c0f9 edit and delete dispatched lines 2020-05-19 14:18:06 +02:00
Pierre Ardoin
c0b9fef229
Fix issue in status name 
Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param

Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
 2020-05-05 08:40:30 +02:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
86be024dcc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-23 17:17:42 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
e1129babbc Code comment 2020-04-23 12:44:30 +02:00
Laurent Destailleur
93278b2dca FIX #13713 2020-04-23 12:42:03 +02:00
Sekan, Tobias
7de4f4d0bb Cleanup user rights on forun commande card 2020-04-21 12:13:15 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
atm-quentin
83f3c9ab6e use only 1 if 2020-04-10 12:09:18 +02:00
atm-quentin
28fa0e4e5d FIX missing selectedlines on supplier order but checkbox are displayed 2020-04-10 11:55:00 +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
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
efaea37d61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-03-30 19:42:53 +02:00
Laurent Destailleur
07d64f47e3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:37:29 +02:00
atm-quentin
64207ef58d FIX missing array option 2020-03-30 14:18:59 +02:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Laurent Destailleur
ca4b641094 FIX #13407 2020-03-23 15:24:29 +01: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
56d6c4691f FIX #13382 Note will be concat to private note 2020-03-18 21:06:36 +01:00
Laurent Destailleur
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6 Fix look and feel v11 2020-03-13 16:52:00 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
c8bbaa07fd FIX Look and feel v11 2020-03-11 15:53:08 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Marc de Lima Lucio
b58608dab0 NEW: supplier order list: enable multicurrency columns 2020-03-03 09:56:25 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
 2020-02-18 22:40:43 +01:00
Laurent Destailleur
31ae0bc06e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/product/card.php
 2020-02-18 22:38:30 +01:00
Regis Houssin
110a23623b FIX an external user can not approved 2020-02-18 11:04:11 +01:00
Regis Houssin
4511cf1060 FIX missing "statut" for getNomUrl() function 2020-02-18 09:03:25 +01:00
Regis Houssin
1034e4a472 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_mc2 2020-02-18 09:02:35 +01:00
Regis Houssin
f6f0d9d4a2 FIX better method to check user rights AND usergroup rights ! 2020-02-18 08:35:51 +01:00
Regis Houssin
a5de331410 FIX Multicompany compatibility 2020-02-17 19:13:37 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
2c40e4be94 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:45 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Frédéric FRANCE
7bea60af84 can replace formconfirm in order supplier 2020-01-10 00:27:40 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
7d07c198bc FIX Price of purchase order and vendor invoice with multicurrency 
FIX entering predefined product with a forced unit price
 2020-01-01 17:15:26 +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
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
b104133f7a
Update orderstoinvoice.php 2019-11-26 18:29:52 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00: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
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
28b10e4610
Merge pull request #12379 from altatof/dispatch_force_qty_input 
NEW : add constant DISPATCH_FORCE_QTY_INPUT
 2019-11-08 11:38:57 +01:00
Laurent Destailleur
52e90a8d91
Update dispatch.php 2019-11-08 11:38:08 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
altairis
c574f5990f add constant DISPATCH_FORCE_QTY_INPUT 2019-11-07 14:31:30 +01:00
Frédéric FRANCE
001010d5e3
fix phpcs 2019-11-07 12:43:33 +01:00
Laurent Destailleur
af2df62aaa
Merge branch 'develop' into patch-7 2019-11-07 11:23:17 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
d2e59fc2af
css 2019-11-05 21:14:22 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
630a150b09 Fix multicurrency rate must be visible if currency differs only 2019-11-03 17:48:16 +01:00
Laurent Destailleur
ab7c300f43 NEW Can change supplier when cloning a Purchase Order 2019-11-02 20:50:25 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +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
Laurent Destailleur
2201b11fd3 NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL 
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
 2019-10-24 13:41:04 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
8da0cd4a35
Merge branch 'develop' into patch-13 2019-10-16 13:32:31 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Frédéric FRANCE
b88059433c
Update list.php 2019-10-14 21:36:38 +02:00
Laurent Destailleur
072a0a26d6 Use a font awesome icon to show "shippable" flag on orders. 2019-10-09 18:07:00 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
f56da782ab
Merge pull request #12038 from Ahuahuachi/develop 
NEW Add hidden options to send by email even for draft status
 2019-10-07 14:18:53 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +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
Alfredo Altamirano
140784d741 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-10-03 20:32:26 -05:00
Alfredo Altamirano
b6882af1b6 Add hidden options to send by email for all status 2019-10-03 20:21:13 -05:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
ce090d43a0 Close #8907 2019-10-01 15:01:29 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
80f498f206 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-14 19:25:52 +02:00
Laurent Destailleur
bbb62f27c7 Update doc 2019-09-14 19:25:09 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Laurent Destailleur
3caa1bd43c FIX Debug feature orderstoinvoice for suppliers 2019-09-14 18:21:37 +02:00
Laurent Destailleur
844f0903da Fix missing fields 2019-09-14 17:34:57 +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
Laurent Destailleur
80daf29d79 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation

Conflicts:
	htdocs/fourn/commande/card.php
 2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation
 2019-09-06 01:52:51 +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
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +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
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +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
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
d3b4a91f41 NEW Can enter price tax incl on vendor proposal and purchase orders 2019-07-05 20:24:22 +02:00
Laurent Destailleur
bbb5b43e94 Fix duplicate trans 2019-07-05 19:03:16 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
ed39849d33 Fix css 2019-07-04 16:14:10 +02:00
Laurent Destailleur
4e00cfb455 Clean code 2019-07-04 16:02:04 +02:00
Laurent Destailleur
d405a58999
Merge pull request #11424 from OPEN-DSI/issue-fourn-commande-card-makeorder 
NEW The order method in purchase order is now mandatory when registering the order
 2019-07-04 15:52:51 +02:00
Laurent Destailleur
1de499a320
Update card.php 2019-07-04 15:52:03 +02:00
Laurent Destailleur
9405ce335e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 15:43:43 +02:00
Laurent Destailleur
657a3ae4c5 FIX permission to delete a draft purchase order 2019-07-04 12:43:32 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +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
VESSILLER
f4978e9473 FIX/NEW - Force mandatory order method 2019-06-28 10:58:31 +02:00
VESSILLER
e6ee1e7041 FIX Force order method in order supplier before making order 2019-06-27 14:21:38 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +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
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
627ef14454 FIX The autocopy feature was ko for suppliers 2019-04-29 18:51:15 +02:00
Lionel VESSILLER
e80436469f Fix default payment condition and method 2019-04-25 16:05:12 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
 2019-04-25 01:50:48 +02:00
Laurent Destailleur
a15f1350be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-25 01:39:02 +02:00
Laurent Destailleur
07caf22647 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-25 01:37:25 +02:00
atm-greg
70017da95a testing if customer invoice module is activated doesn't make sense on supplier commande card... 2019-04-24 14:59:54 +02:00
Laurent Destailleur
691159c56b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 10:24:55 +02:00
Laurent Destailleur
1264857211 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/js/timesheet.js
 2019-04-24 10:24:32 +02:00
atm-greg
6e425d1895 add origin of line in fourn orderstoinvoice.php 2019-04-24 08:56:06 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
2b41d0c59d
Merge pull request #10938 from inoveaconseil/HookPrintFieldLIstFooter 
FIX missing hook
 2019-03-31 18:44:07 +02:00
Laurent Destailleur
0d564cdd6c
Merge pull request #10919 from grandoc/new_branch_26_03_2019 
New branch 26 03 2019
 2019-03-31 18:23:05 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Nicolas ZABOURI
0ab6b15779 FIX missing hook printFieldListFooter 2019-03-28 17:27:30 +01:00
Philippe GRAND
6c1ee52ac6 fix : typo 2019-03-26 12:31:56 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into 
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
 2019-03-22 13:00:48 +01:00
Laurent Destailleur
2b49c0f95e
Merge pull request #10904 from ATM-Nicolas/new_hidden_conf_edit_supplier_on_supplier_order 
NEW Hidden option MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER to edit supplier on draft supplier order
 2019-03-22 12:32:44 +01:00
ATM-Nicolas
742f1cb8af FIX : Show only suppliers 2019-03-22 10:55:49 +01:00
ATM-Nicolas
3149909896 FIX : Update ref_supplier too 2019-03-22 10:29:01 +01:00
ATM-Nicolas
0a23a1157f NEW : Can edit supplier on draft order supplier 2019-03-22 10:28:55 +01:00
Philippe GRAND
b8d04fa076 translation 2019-03-22 09:43:12 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
eeafc3c630 Standardize translation of amount 2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Joan Louis
17647de4cc Fix extrafields calls from cards for Dolibarr 8 See #10803 2019-03-12 11:24:54 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
Joan Louis
ee5753819e Update call to extrafields from cards 2019-03-11 14:22:04 +01:00
Frédéric FRANCE
d96cc53f97
replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
 2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/modAgenda.class.php
 2019-03-02 19:07:14 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
gauthier
786c114026 FIX : project_title for display of getNomUrl() 2019-02-28 16:13:45 +01:00
atm-quentin
72dc25552a FIX better placement 2019-02-27 09:23:31 +01:00
atm-quentin
cb3a4ac94c missing 1st char 2019-02-27 09:23:23 +01:00
atm-quentin
95593bfaad fix scan barcode only one time instead of 2 (when it was focus we need to open and then write) 2019-02-27 09:23:06 +01:00
atm-quentin
f1055d0e5c make select2 focus to earn time during scanning 2019-02-27 09:22:57 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +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
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +01:00
Frédéric FRANCE
96de1b175c
clean missing spaces in the last merge 2019-02-02 08:51:30 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
6de732d7f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
 2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
	htdocs/fourn/commande/list.php
 2019-02-01 16:05:43 +01:00
florian HENRY
f7bed44441 FIX : quick search for supplier orders 2019-01-31 21:39:02 +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
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019 
update with html5 compliant code
 2019-01-21 18:05:40 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc 2019-01-21 18:04:48 +01:00
Philippe GRAND
cdacfc5f37 update with html5 compliant code 2019-01-21 09:54:59 +01:00
torvista
07b2bb6715 Swap of align/valign/border/width for css 
Removal of type="text/javascript"
 2019-01-20 23:36:39 +01:00
Philippe GRAND
549bbb06fc update with html5 compliant code 2019-01-19 12:50:06 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
3af418349a FIX Can't empty the payment mode 2018-12-29 07:54:30 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +01:00
Laurent Destailleur
b511a056f4 Fix phpcs 2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309 Fix regression (bad name of function) 2018-12-14 19:21:19 +01:00
Laurent Destailleur
4b90f88793
Merge pull request #10158 from defrance/patch-135 
Refactoring list with dol_sql_datefilter function (end)
 2018-12-14 19:06:54 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
BENKE Charlene
1bc0defb31
Update list.php 2018-12-02 09:55:26 +01:00
Laurent Destailleur
0367795488 Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
Thibault Descamps
c2e5a29246 NEW redirect if only one result on global search on card 2018-11-22 11:36:30 +01:00
Thibault Descamps
1cc130e5f6 NEW : conf to change concat desc order 2018-11-21 09:57:44 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/card.php
 2018-11-19 15:55:41 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
gauthier
85dd0ec2dd FIX : filter on product category doesn't work 2018-11-13 15:24:53 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Frédéric FRANCE
fe5056add8
remove fieldlabel and add fieldeditkey 2018-10-27 18:07:05 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +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
atm-quentin
f11e1940fc NEW mass action list reception create bills for validated reception 2018-10-16 12:05:28 +02:00
atm-quentin
83c8a78628 NEW auto event msg 2018-10-15 17:08:28 +02:00
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +02:00
atm-quentin
3e29b11890 NEW add field list if reception 2018-10-11 17:30:14 +02:00
atm-quentin
6a8092dfae NEW entete reception card 2018-10-05 16:21:50 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +02:00
atm-quentin
5fe767d7bd debut card create 2018-10-04 12:27:10 +02:00
atm-quentin
bc07936d42 NEW list on dispatch 2018-10-04 10:17:18 +02:00
atm-quentin
52717dbb65 NEW debut rename stock conf 2018-10-03 18:05:22 +02:00
Frédéric FRANCE
1735229f15
remove useless param 
/**
     *  Return label of a status
     *
     * 	@param  int $statut		Id statut
     *  @param  int $mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
     *  @param  int $billed     1=Billed
     *  @return string				Label of status
     */
    function LibStatut($statut,$mode=0,$billed=0)
    {
 2018-10-02 20:47:40 +02:00
Laurent Destailleur
d72446cebc
Merge pull request #9528 from grandoc/new_branch_16_09_2018 
New branch 16 09 2018
 2018-09-18 15:01:23 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Philippe GRAND
9f35767b4b Standardize and update code 2018-09-16 11:53:49 +02:00
Philippe GRAND
251273e3c3 Standardize and update code 2018-09-16 11:50:29 +02:00
Philippe GRAND
cd8e0aa919 Standardize and update code 2018-09-16 11:47:56 +02:00
Philippe GRAND
120f823065 Standardize and update code 2018-09-16 11:45:18 +02:00
Philippe GRAND
988774120c Standardize and update code 2018-09-16 11:42:20 +02:00
Philippe GRAND
ab92871dc3 Standardize and update code 2018-09-16 11:37:43 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Frédéric FRANCE
8249756726
replace select_date 2018-09-09 10:40:00 +02:00
Laurent Destailleur
ff05997f0a FIX Several fixes on the management of minimal amount for orders 2018-09-06 17:37:02 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Laurent Destailleur
9cc6533d11 Fix td alignement 2018-08-30 18:57:30 +02:00
Laurent Destailleur
7211aff016
Update dispatch.php 2018-08-29 21:11:28 +02:00
Laurent Destailleur
a8bb55c66d
Merge branch '8.0' into 7.0_new_dispatch 2018-08-29 21:08:51 +02:00
Laurent Destailleur
88044a3d75
Update dispatch.php 2018-08-29 20:42:19 +02:00
atm-quentin
76cb9f60c7 NEW hook on dispatch order fourn 2018-08-29 14:26:04 +02:00
Frédéric FRANCE
c0478cb42f
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-14 15:54:40 +02:00
Philippe GRAND
dc3a2ac26e standardize code 2018-08-12 22:40:47 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 19:54:03 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description 
NEW Can record the supplier product description
 2018-08-12 18:56:27 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Frédéric FRANCE
5f4d54ede5
correct space 2018-08-07 17:17:58 +02:00
atm-greg
ad5f59822e Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510 Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:31:41 +02:00
atm-greg
a8b33a1710 New fields desc_supplier on product_fourn_prices 2018-08-06 16:26:25 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters 
FIX : page must always be 0 when we search
 2018-08-02 17:48:35 +02:00
Philippe GRAND
ff04cb64c0 Clean and update code 2018-07-25 15:36:50 +02:00
Frédéric FRANCE
bde30b85ad
use defaut currency for supplier order 2018-07-24 17:06:12 +02:00
gauthier
80ff7fa86f FIX : case when we valid form with keyboard 2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06 FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied) 2018-07-11 09:51:36 +02:00
Laurent Destailleur
eb71810bdc
Merge pull request #8999 from dolibarr95/patch-46 
NEW Add supplier ref in item reception page
 2018-06-29 19:18:20 +02:00
Laurent Destailleur
569291763f
Update dispatch.php 2018-06-29 19:17:44 +02:00
Laurent Destailleur
da138db528 FIX combo into popup become crazy with IE10 
Conflicts:
	htdocs/asset/card.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-06-28 12:16:12 +02:00
Laurent Destailleur
ed2ec78332 FIX combo of stock in popup are crazy in IE 2018-06-28 12:11:00 +02:00
Laurent Destailleur
3ea2d81279 FIX combo into popup become crazy with IE10 2018-06-28 12:05:02 +02:00
Laurent Destailleur
55d5d01cfe FIX combo of stock in popup are crazy in IE 2018-06-28 11:53:52 +02:00
Philippe GRAND
1bb91c7860 update and clean code 2018-06-24 16:20:27 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
dolibarr95
3b33dad8fd
Add supplier ref 
Hi

In all common case the supplier send a receipt with the parcel on which is writen his product ref (because this is his reference) with the quantity in the parcel and if he is smart/nice our reference.
By adding the supplier ref column the supplier order dispatch is easier.

Tks.
 2018-06-20 14:40:32 +02:00
Laurent Destailleur
187127ce6f Fix CSS 2018-06-16 21:19:50 +02:00
Laurent Destailleur
7ad086bbdf FIX Duplicate select2 when we split a supplier order receipt item 2018-06-16 17:18:17 +02:00
Laurent Destailleur
5524784421 FIX prefilled date of order must have hours too 2018-06-16 15:24:31 +02:00
Laurent Destailleur
7981bd08b7 Fix price+sql error when adding product when no supplier price defined 2018-06-16 14:47:33 +02:00
Laurent Destailleur
4898f10fa2 FIX Adding a product with no supplier price defined yet 2018-06-16 13:49:28 +02:00
Marc de Lima Lucio
1dec4c4320 FIX: supplier order: product supplier ref not saved on addline 2018-06-14 10:37:40 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Laurent Destailleur
fdc90da408
Update card.php 2018-06-13 20:02:38 +02:00
florian HENRY
8031ef49f2 fix error return 2018-06-05 20:38:55 +02:00
Laurent Destailleur
984ef37ff5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:19:05 +02:00
Laurent Destailleur
9a345e99ef Fix syntax error 2018-04-29 20:14:57 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
a80621471c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
 2018-04-27 12:42:18 +02:00
Laurent Destailleur
4c87cbf644
Update card.php 2018-04-27 12:14:51 +02:00
Laurent Destailleur
1cbf5f1c5e
Merge pull request #8687 from dolibarr95/patch-43 
NEW : Allow negative quantity for dispatch (supplier order)
 2018-04-27 11:41:05 +02:00
Laurent Destailleur
2ecbd132aa
Merge pull request #8668 from tuxgasy/Add_Hook_ordersupplierdispatch 
New ordersupplierdispatch hook
 2018-04-27 09:47:22 +02:00
dolibarr95
1fb6f79727
Update dispatch.php 
Only without batch module enabled
 2018-04-27 09:14:52 +02:00
Laurent Destailleur
5eb7c7ffff FIX Edit of ref_supplier in supplier invoice 2018-04-24 13:22:34 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price 
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
 2018-04-24 12:57:31 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00
TuxGasy
6d552a2ae6 Add ordersupplierdispatch hook 2018-04-23 15:05:37 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
912d5c53f2 Standardize code 2018-04-21 15:54:05 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang
 2018-04-16 18:19:21 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290 Fix translation of button action must be a verb 2018-04-16 11:12:56 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
All-3kcis
880fa55dd5 display user-friendly filesize 2018-04-12 15:29:22 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
307f217d56
Merge pull request #8543 from ATM-Nicolas/fix_duplicate_events 
FIX : multiple creation of same event
 2018-04-11 16:28:32 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +02:00
ATM-Nicolas
cffe1e9771 FIX : Multiple creation of same event 2018-04-10 17:11:18 +02:00
Maxime Kohlhaas
cb1a011b50 Fix default currency not set on supplier order creation from commercial menu #8459 2018-04-10 14:14:16 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
99ed9c4589 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/compta/facture/list.php
 2018-04-08 13:10:10 +02:00
Laurent Destailleur
79af10fc83 Fix search filters 2018-04-08 13:01:42 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list 
NEW: generalize use of button to create new element from list
 2018-04-05 16:40:15 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Marc de Lima Lucio
3646374976 NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders 2018-03-28 11:54:21 +02:00
dolibarr95
5a63771c87
Add date 2018-03-27 15:11:42 +02:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
ff765a2efe FIX Look and feel v7 2018-03-16 12:16:40 +01:00
Laurent Destailleur
273e1cdd8d FIX Look and feel v7 2018-03-16 10:14:14 +01:00
Laurent Destailleur
93f4d6fdcd Translation 2018-03-11 21:34:38 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Maxime Kohlhaas
d92fa3a69c Fix required field + space in dispatch 2018-03-09 23:49:40 +01:00
Laurent Destailleur
ad96229ec4 Fix not visible template selector for supplier order/invoice emails 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-03-08 20:52:25 +01:00
Laurent Destailleur
e983e0709f Fix not visible template selector for supplier order/invoice emails 2018-03-08 20:49:37 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency 
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
 2018-03-07 13:12:23 +01:00
atm-ph
5971cd8e59 Fix label goes in desc and lost fourn ref 2018-03-05 17:18:03 +01:00
atm-ph
ebb4da8417 Fix keep supplier proposal price in supplier order 2018-03-05 16:58:35 +01:00