Laurent Destailleur
|
87cd4b11bd
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2020-07-19 02:24:38 +02:00 |
|
Laurent Destailleur
|
8d26329653
|
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
htdocs/core/lib/price.lib.php
htdocs/projet/activity/perday.php
|
2020-07-19 02:24:26 +02:00 |
|
Laurent Destailleur
|
acdb61b640
|
Merge pull request #14227 from defrance/patch-154
NEW : add class for ticket edition (pdf or odt)
|
2020-07-19 02:11:13 +02:00 |
|
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
|
d598039f20
|
Merge pull request #14218 from Ahuahuachi/12.0
Update Mexico City name
|
2020-07-19 02:01:12 +02:00 |
|
Laurent Destailleur
|
521c4679d9
|
FIX #14241 Mysql 8 compatibility
|
2020-07-19 01:52:30 +02:00 |
|
Laurent Destailleur
|
f26a64fb88
|
FIX If using a rounding step, localtax1+2 not included in total
|
2020-07-19 01:47:17 +02:00 |
|
Laurent Destailleur
|
48adeb9dd7
|
FIX #14256
|
2020-07-19 01:38:38 +02:00 |
|
Laurent Destailleur
|
6fdd5ea73a
|
Not required
|
2020-07-19 01:31:51 +02:00 |
|
Laurent Destailleur
|
ee74740384
|
FIX #14259
|
2020-07-19 01:29:42 +02:00 |
|
Laurent Destailleur
|
16d486e211
|
FIX Setup of currency limit and accuracy
|
2020-07-19 01:03:37 +02:00 |
|
Laurent Destailleur
|
32410b59c4
|
Code comment
|
2020-07-19 00:02:02 +02:00 |
|
Laurent Destailleur
|
3069eaa5c0
|
Merge pull request #14191 from Gecka-Apps/12.0-fix-14181
[REGRESSION] Fix #14181. Limits and accuracy form not saving modified values.
|
2020-07-18 23:59:29 +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
|
c30491284f
|
Fix phpcs
|
2020-07-18 23:16:05 +02:00 |
|
Laurent Destailleur
|
52fd424812
|
Merge pull request #14226 from cfoellmann/thirdparty-leftmenu
Thirdparty leftmenu
|
2020-07-18 23:13:40 +02:00 |
|
Abdessalam@MEGALOGI
|
1e6273b92d
|
Update card.php
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
|
2020-07-18 23:11:17 +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 |
|
Oarces DEV
|
f3e3c47af3
|
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 23:04:22 +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
|
15cdb3ed79
|
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0
|
2020-07-18 23:00:09 +02:00 |
|
Laurent Destailleur
|
ac92a9fa40
|
Doc more complete
|
2020-07-18 22:59:47 +02:00 |
|
Laurent Destailleur
|
a252c87c82
|
Fix comment
|
2020-07-18 19:41:11 +02:00 |
|
Laurent Destailleur
|
cbc8187616
|
Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering
Fix extrafields ordering on PDFs
|
2020-07-18 19:30:34 +02:00 |
|
Laurent Destailleur
|
eef66ae6ed
|
Fix var not defined
|
2020-07-18 19:22:03 +02:00 |
|
Laurent Destailleur
|
bb4543167f
|
FIX #14222
|
2020-07-18 19:19:12 +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
|
ecfcbeef26
|
Merge pull request #14229 from FHenry/12.0_fix_ShowAdressThirdpartyOption_Extrafield_linkobject
fix extrafields linnktoObject Thirdpary option showAdress
|
2020-07-18 19:13:52 +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 |
|
Laurent Destailleur
|
f07a1a6d1e
|
FIX for #14253
|
2020-07-18 18:54:55 +02:00 |
|
Laurent Destailleur
|
6ad8145645
|
FIX for #14253
|
2020-07-18 18:52:33 +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 |
|
florian HENRY
|
72e0250117
|
fix extrafields linnktoObject Thirdpary option showAdress
|
2020-07-13 17:53:00 +02:00 |
|
florian HENRY
|
1173059e7b
|
fix extrafields linnktoObject Thirdpary option showAdress
|
2020-07-13 17:52:41 +02:00 |
|
florian HENRY
|
96d26be1d4
|
fix extrafields linnktoObject Thirdpary option showAdress
|
2020-07-13 17:51:58 +02:00 |
|
florian HENRY
|
045fbad616
|
fix extrafields linnktoObject Thirdpary option showAdress
|
2020-07-13 17:48:21 +02:00 |
|
BENKE Charlene
|
a2cf473891
|
add class for ticket edition (pdf or odt)
|
2020-07-13 14:24:07 +02:00 |
|