Commit Graph

87863 Commits

Author SHA1 Message Date
Laurent Destailleur
e17fbf9dcd
Merge pull request #14206 from atm-josselin/NEW_show_label_on_batch_card
NEW Show label on batch card
2020-07-19 02:03:46 +02:00
Laurent Destailleur
3c3be1b04f
Merge pull request #14188 from aspangaro/13a1
NEW: Add column quantity in product margin page
2020-07-19 02:02:30 +02:00
Laurent Destailleur
1f52d99726
Merge pull request #14211 from bb2a/add_zip_town_on_SEARCH_THIRDPARTY
Add zip town on search thirdparty
2020-07-18 23:58:36 +02:00
Laurent Destailleur
31cb57afc9 Fix regression with ecoterm 2020-07-18 23:27:43 +02:00
Laurent Destailleur
52fd424812
Merge pull request #14226 from cfoellmann/thirdparty-leftmenu
Thirdparty leftmenu
2020-07-18 23:13:40 +02:00
Laurent Destailleur
090d913017
Merge pull request #14248 from megalogi/patch-1
FIX Lose HTML tags when adding a new product/service into a document
2020-07-18 23:10:33 +02:00
Laurent Destailleur
3bfa86c52d
Merge pull request #14251 from fmarcet/develop
New: ##12972 Update supplier price also when product has batch
2020-07-18 23:08:20 +02:00
Laurent Destailleur
0179800236
Merge pull request #14257 from cmfpmatik/cmfpmatik-order_prospect-1
Add the possibility for the prospect to order
2020-07-18 23:03:34 +02:00
Laurent Destailleur
ab32e3e1a9
Merge pull request #14222 from pstructures/PSdevelop
Error Caused by $taskid Variable not existing
2020-07-18 19:15:28 +02:00
Laurent Destailleur
a8fbec8491
Merge pull request #14216 from grandoc/new_branch_11_07_2020
Minimum version of PHP required by module
2020-07-18 19:12:50 +02:00
Laurent Destailleur
cd997d216e
Merge pull request #14230 from cfoellmann/fix-default-search
fix the global `DEFAULT_SEARCH_INTO_MODULE`
2020-07-18 19:11:23 +02:00
Laurent Destailleur
179f3d44c6
Merge pull request #14238 from dolibit-ut/patch-32
Update llx_c_incoterms.sql
2020-07-18 19:09:26 +02:00
Laurent Destailleur
768e85350b
Merge pull request #14237 from dolibit-ut/patch-31
Update llx_c_incoterms.sql
2020-07-18 19:09:07 +02:00
Oarces DEV
97826f140f
Add the possibility for the prospect to order
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 11:55: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
Abdessalam@MEGALOGI
9d481cf15e
Update card.php
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-15 20:21:27 +01:00
Alexandre SPANGARO
8d9f0dc4b2 Merge remote-tracking branch 'upstream/develop' into 13a1 2020-07-15 13:53:55 +02:00
UT from dolibit
60f904bbd3
Update llx_c_incoterms.sql
add column label for short standard term in english
(libelle to use for long description (in user language))
2020-07-14 14:15:44 +02:00
UT from dolibit
7184fba8c6
Update llx_c_incoterms.sql
add column 'label' for short term description in english
add new Incoterm DPU  (DAT is obsolete , but let it stay for older documents)
2020-07-14 13:59:16 +02:00
Christian Foellmann
a4e9c478e7 fix the global DEFAULT_SEARCH_INTO_MODULE - current value will not push anything above the core modules 2020-07-13 18:14:57 +02:00
Christian Foellmann
4674367099 remove old commented out code lines 2020-07-13 14:18:16 +02:00
Christian Foellmann
d43c30defd change level of left menu for thirdparty types 2020-07-13 14:17:12 +02:00
Matt Sidnell
50e3822465 Merge branch 'PSdevelop' of https://github.com/pstructures/dolibarr-core into PSdevelop 2020-07-12 21:22:06 +01:00
Matt Sidnell
2797c5e65f Updated Issue with declared progress 2020-07-12 21:21:34 +01:00
mattsidnell
ac945b5d96
Merge pull request #14 from Dolibarr/develop 2020-07-12 20:35:42 +01:00
Matt Sidnell
378c8c4691 Error on time pent page where progress was getting unset 2020-07-12 20:34:04 +01:00
Philippe GRAND
ffae6b02c1 Minimum version of PHP required by module 2020-07-11 15:11:39 +02:00
Philippe GRAND
448f031948 Minimum version of PHP required by module 2020-07-11 15:11:15 +02:00
Philippe GRAND
5902dd6df3 Minimum version of PHP required by module 2020-07-11 15:10:53 +02:00
Philippe GRAND
2906e9b848 Minimum version of PHP required by module 2020-07-11 15:10:26 +02:00
Philippe GRAND
fc778e433f Minimum version of PHP required by module 2020-07-11 15:10:02 +02:00
Philippe GRAND
8c5bdb8fb6 Minimum version of PHP required by module 2020-07-11 15:09:36 +02:00
Philippe GRAND
3ee18e5852 Minimum version of PHP required by module 2020-07-11 15:09:15 +02:00
Philippe GRAND
1d5a1beb79 Minimum version of PHP required by module 2020-07-11 15:08:52 +02:00
Philippe GRAND
1bb60ca7cc Minimum version of PHP required by module 2020-07-11 15:08:28 +02:00
Philippe GRAND
1358801316 Minimum version of PHP required by module 2020-07-11 15:08:00 +02:00
Philippe GRAND
b4252b899c Minimum version of PHP required by module 2020-07-11 15:07:33 +02:00
Philippe GRAND
9451148928 Minimum version of PHP required by module 2020-07-11 15:07:09 +02:00
Philippe GRAND
bbde5a3c95 Minimum version of PHP required by module 2020-07-11 15:06:44 +02:00
Philippe GRAND
05b97dc134 Minimum version of PHP required by module 2020-07-11 15:06:17 +02:00
Philippe GRAND
eb602d8bae Minimum version of PHP required by module 2020-07-11 15:05:49 +02:00
Philippe GRAND
2e6addae11 Minimum version of PHP required by module 2020-07-11 15:05:20 +02:00
Philippe GRAND
f453c2272a Minimum version of PHP required by module 2020-07-11 15:04:54 +02:00
Philippe GRAND
3a4f526ccd Minimum version of PHP required by module 2020-07-11 15:04:31 +02:00
Philippe GRAND
8f37bb5a69 Minimum version of PHP required by module 2020-07-11 15:04:06 +02:00
Philippe GRAND
d4562a91ff Minimum version of PHP required by module 2020-07-11 15:03:38 +02:00
Philippe GRAND
8d06471a4e Minimum version of PHP required by module 2020-07-11 15:03:00 +02:00
Philippe GRAND
b26a1042d2 Minimum version of PHP required by module 2020-07-11 15:02:03 +02:00
Philippe GRAND
b2af2320ef Merge branch 'new_branch_11_07_2020' of github.com:grandoc/dolibarr into new_branch_11_07_2020 2020-07-11 14:57:26 +02:00