Regis Houssin
|
6597c9f60d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-17 06:45:08 +02:00 |
|
ptibogxiv
|
70d9d3ab4c
|
FIX contact default list with adding job/function
as my last commit it's same contact but différent job / function. More clear for choosing right contact in the list (PR from my dolibarr's customer)
|
2019-06-04 18:23:25 +02:00 |
|
Regis Houssin
|
38246b4088
|
NEW add new function "setEntity()"
|
2019-06-03 11:13:26 +02:00 |
|
Regis Houssin
|
b73df2698d
|
FIX better compatibility with Multicompany
|
2019-05-12 14:25:41 +02:00 |
|
Laurent Destailleur
|
a94c291b76
|
Dolibarization
|
2019-05-09 16:59:06 +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
|
e6ffaeefe5
|
CSS
|
2019-04-17 10:39:30 +02: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
|
a7181750c6
|
Merge pull request #10879 from altatof/noconcatdesc
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-22 12:56:46 +01:00 |
|
Philippe GRAND
|
b8d04fa076
|
translation
|
2019-03-22 09:43:12 +01:00 |
|
Christophe Battarel
|
8b3fd2eacf
|
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-18 16:10:17 +01:00 |
|
Laurent Destailleur
|
c0b6699b25
|
All methods set_draft() were renamed into setDraft()
|
2019-03-15 19:01:40 +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
|
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 |
|
Laurent Destailleur
|
3ec2338c2d
|
Look and feel v10
|
2019-02-26 19:37:32 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +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
|
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
|
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
|
611ccc4a9a
|
Merge branch 'develop' into fieldlabel
|
2018-12-14 15:42:01 +01:00 |
|
Laurent Destailleur
|
233e160489
|
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2
NEW Extend import option to Order's card and Propal's card
|
2018-12-14 15:29:27 +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
|
66ea8bbe87
|
FIX : fourn payment modes musn't be available on customer docs
|
2018-11-12 15:58:41 +01:00 |
|
Frédéric FRANCE
|
c92a2084f1
|
remove fieldlabel and add fieldeditkey
|
2018-10-27 14:50:27 +02:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
9c7ec434b7
|
remove fieldlabel and add fieldeditkey
|
2018-10-27 13:48:30 +02:00 |
|
Frédéric FRANCE
|
d67c40dffe
|
remove fieldlabel and add fieldeditkey
|
2018-10-27 13:01:01 +02:00 |
|
Frédéric FRANCE
|
f29ee25ea7
|
remove fieldlabel and add fieldeditkey
|
2018-10-27 11:06:45 +02:00 |
|
atm-john
|
759b2b6ccf
|
Extend import option to Order's card and Propal's card
|
2018-10-25 21:39:22 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
26d20d0b76
|
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
NEW Advanced permission to ignore price min
|
2018-09-27 09:57:49 +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 |
|
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
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +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
|
4ac67e6409
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-05 20:31:10 +02:00 |
|
Laurent Destailleur
|
f1cb13634b
|
FIX Entering negative price on order
|
2018-09-05 14:55:45 +02:00 |
|
Laurent Destailleur
|
c2548b8b39
|
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm
NEW hook formConfirm always called if hooked
|
2018-09-01 14:50:08 +02:00 |
|
ksar-ksar
|
49d3bea192
|
Remove the test
After discussion with Frederic, the best solution is to remove the test
|
2018-08-30 11:27:48 +02:00 |
|
ksar-ksar
|
a844855ade
|
Update hook formConfirm
The hook should be called when the $formconfirm is not empty
|
2018-08-24 16:40:26 +02:00 |
|
Frédéric FRANCE
|
9025c452ef
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-07 16:40:03 +02:00 |
|
Philippe GRAND
|
fb565b15c5
|
standardize
|
2018-07-29 19:16:28 +02:00 |
|
Frédéric FRANCE
|
c991a4d204
|
trim trailing
|
2018-07-26 18:05:20 +02:00 |
|
Philippe GRAND
|
2a6f050e32
|
Clean and update code
|
2018-07-24 18:28:56 +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
|
3ea2d81279
|
FIX combo into popup become crazy with IE10
|
2018-06-28 12:05:02 +02:00 |
|
Laurent Destailleur
|
edd7499375
|
Fix clone with new architecture
|
2018-06-19 09:21:23 +02:00 |
|
Laurent Destailleur
|
c1f5c6becf
|
Merge pull request #8877 from frederic34/longlines
soft limit length of lines to 500 chars
|
2018-05-30 11:19:29 +02:00 |
|
Frédéric FRANCE
|
e2a557aadd
|
limit length of lines to 500 chars
|
2018-05-27 15:04:12 +02:00 |
|
Frédéric FRANCE
|
30a3b95368
|
loadlangs
|
2018-05-26 20:32:23 +02:00 |
|
Frédéric FRANCE
|
8547827575
|
Merge remote-tracking branch 'upstream/develop' into multipriceqty
|
2018-05-23 17:06:02 +02:00 |
|
Frédéric FRANCE
|
efbb053e54
|
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
|
2018-05-23 17:05:08 +02:00 |
|
atm-quentin
|
8cd6c72a2f
|
NEW advanced rights
|
2018-05-07 10:04:43 +02:00 |
|
Laurent Destailleur
|
7511ba52ae
|
NEW Suggest link to pay online for customer orders
|
2018-05-05 22:20:33 +02:00 |
|
Laurent Destailleur
|
546da0ceda
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
|
2018-05-05 14:40:39 +02:00 |
|
atm-quentin
|
ec5e84075e
|
NEW Rights to ignore price min
|
2018-05-03 10:18:38 +02:00 |
|
Laurent Destailleur
|
3340598cf8
|
FIX Projet is not prefilled when created from overwiew page
|
2018-05-01 14:15:11 +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
|
7108f68db9
|
Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
|
2018-04-10 12:03:01 +02:00 |
|
John
|
d689e88b92
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
|
2018-04-03 11:38:12 +02:00 |
|
Laurent Destailleur
|
3b55049895
|
Dolibarrize module ticket
|
2018-03-22 10:23:25 +01:00 |
|
Alexandre SPANGARO
|
c0d4ca3682
|
Fix : Remove two langs->load("sendings") and use loadLangs instead
|
2018-03-11 22:28:27 +01:00 |
|
Laurent Destailleur
|
93f4d6fdcd
|
Translation
|
2018-03-11 21:34:38 +01:00 |
|
Regis Houssin
|
ea175cd6c1
|
Fix: compatibility with multicompany dictionnary sharing
|
2018-03-09 09:37:23 +01:00 |
|
Marc de Lima Lucio
|
451d943927
|
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
|
2018-03-02 16:48:25 +01:00 |
|
Marc de Lima Lucio
|
7cd1b2caa9
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
|
2018-02-27 16:45:01 +01:00 |
|
Laurent Destailleur
|
0cc84ab92f
|
FIX Missing restore_lastsearch_values
|
2018-02-26 21:21:28 +01:00 |
|
Laurent Destailleur
|
3c552cec15
|
FIX Missing restore_lastsearch_values
|
2018-02-26 21:16:40 +01:00 |
|
Laurent Destailleur
|
0a79550f43
|
Fix oldcopy must be saved before update_extras
|
2018-02-23 16:11:00 +01:00 |
|
John
|
f313fb925b
|
Add new checkbox for lines
|
2018-02-21 17:06:40 +01:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
809ef1bd00
|
FIX Trigger *_MODIFY must be called when editing a property event extra.
Clean duplicate trigggers "*_CLONE"
|
2018-02-20 18:09:38 +01:00 |
|
Marc de Lima Lucio
|
95be155010
|
FIX: supplier credit notes: harmonize discount filters
|
2018-02-20 12:26:29 +01:00 |
|
Marc de Lima Lucio
|
905adab517
|
NEW: supplier credit notes: display supplier discounts in supplier order card
|
2018-02-16 11:23:59 +01:00 |
|
Laurent Destailleur
|
475b89bac1
|
Merge branch 'develop' into new_order_min_amount
|
2018-02-08 14:20:53 +01:00 |
|
Laurent Destailleur
|
b3df7670e9
|
Merge pull request #7999 from frederic34/propalweight
NEW display weight volume in propal
|
2018-02-03 16:58:58 +01:00 |
|
Maxime Kohlhaas
|
9899a02630
|
Display alert if order total is under order min amount
|
2018-01-20 20:17:56 +01:00 |
|
Laurent Destailleur
|
43d560830c
|
Fix on old php
|
2018-01-10 13:20:43 +01:00 |
|
Laurent Destailleur
|
9f79ad800b
|
Fix price per quantity
|
2018-01-09 14:20:47 +01:00 |
|
Laurent Destailleur
|
42e659e26c
|
Fix link for online payment
|
2018-01-08 13:21:04 +01:00 |
|
Frédéric FRANCE
|
33f6ba19da
|
display weight volume in propal
|
2017-12-28 16:20:08 +01:00 |
|
Laurent Destailleur
|
f1305bbdd6
|
Fix css
|
2017-12-20 21:14:22 +01:00 |
|
Laurent Destailleur
|
1351a43a30
|
FIX Maxi debug of permission for users external or restricted to sales
representatives
|
2017-12-18 16:13:05 +01:00 |
|
Laurent Destailleur
|
1251807f54
|
Fix several pb in links to projects on create page
|
2017-12-12 10:37:51 +01:00 |
|
Laurent Destailleur
|
bb7c03906e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
|
2017-12-11 15:25:09 +01:00 |
|