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 |
|