Commit Graph

83486 Commits

Author SHA1 Message Date
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Laurent Destailleur
83b5fe3c71 FIX #13077 Replace left join with inner join (left join was useless) 2020-02-12 20:24:58 +01:00
Laurent Destailleur
3f4c787c84 Fix physical stock were truncated in product/reassort page 2020-02-12 20:22:53 +01:00
Laurent Destailleur
18f0a0f73e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-12 19:36:43 +01:00
Laurent Destailleur
d419315e98 FIX #13048 2020-02-12 19:36:29 +01:00
Laurent Destailleur
ccb895e251
Merge pull request #13083 from atm-greg/FIX_bookkeeping_LD_Compta_Export
fix missing fields in LD Compta Export
2020-02-12 18:41:34 +01:00
Laurent Destailleur
3a9125b097
Merge pull request #13087 from ptibogxiv/patch-304
Fix netmeasure update and display
2020-02-12 18:35:44 +01:00
Laurent Destailleur
bd0666bf53
Update product.lib.php 2020-02-12 18:35:15 +01:00
Thomas
9b0b5f755b Fixed missing trigger on contact delete 2020-02-12 18:24:37 +01:00
Laurent Destailleur
e9688e66c0
Merge pull request #13084 from atm-john/11.0_fix_retained_warranty_hasdelay
FIX - hasDelay for retained warranty
2020-02-12 18:22:53 +01:00
Laurent Destailleur
03a8414ba8 FIX #13085 2020-02-12 18:21:45 +01:00
Laurent Destailleur
e74df397eb FIX #13094 2020-02-12 17:28:18 +01:00
Laurent Destailleur
66493672eb Clean code 2020-02-12 15:20:37 +01:00
Laurent Destailleur
2dafbe0f91 Fix labels 2020-02-12 15:19:42 +01:00
ptibogxiv
f17c7f4cb3
fix for unit with rowid (netmeasure) 2020-02-11 20:21:53 +01:00
ptibogxiv
558ccdd8b9
Update card.php 2020-02-11 20:20:34 +01:00
ptibogxiv
5459e4b821
Fix netmeasure update and display
nb: netmeasure is for real weight, volume or piece;

 i'll try to introduce in v12 price by unit using this value ( needed for some business ie fruits, vegetables....)
2020-02-11 20:11:37 +01:00
Laurent Destailleur
92dc43de93 Fix phpcs 2020-02-11 19:37:24 +01:00
Laurent Destailleur
cc6313cdf3 Fix import examples 2020-02-11 19:32:27 +01:00
Laurent Destailleur
7f146111d2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-11 19:20:46 +01:00
Laurent Destailleur
2afe86a1d6 Fix look and feel v11 2020-02-11 19:19:13 +01:00
Laurent Destailleur
aa9ffbba05 Fix missing fields property 2020-02-11 19:18:36 +01:00
Laurent Destailleur
d2bafe3052 Add tab with stock movements 2020-02-11 18:18:04 +01:00
Laurent Destailleur
c6f46e0aec Fix look and feel v11 2020-02-11 17:20:12 +01:00
stickler-ci
27dd9aec9f Fixing style errors. 2020-02-11 16:12:48 +00:00
Laurent Destailleur
bf49e5cee1 Show tab of stock movement of MO 2020-02-11 17:12:22 +01:00
John Botella
02f268ea4e FIX - hasDelay for retained warranty 2020-02-11 16:54:27 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
3c865cbf72 Fix button cancel and re-open 2020-02-11 16:51:38 +01:00
Laurent Destailleur
9f5f460ae2 Fix field def 2020-02-11 16:42:48 +01:00
stickler-ci
fc170c1081 Fixing style errors. 2020-02-11 15:20:46 +00:00
Laurent Destailleur
8518e0752f NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page 2020-02-11 16:01:32 +01:00
atm-greg
66f6d1bfd4 add missing fields 2020-02-11 15:57:49 +01:00
Laurent Destailleur
878026ebc5 Fix phpcs 2020-02-11 14:44:53 +01:00
Laurent Destailleur
5533526331 Fix phpcs 2020-02-11 11:48:10 +01:00
Laurent Destailleur
03ee488d5f Fix look and feel v11 2020-02-11 10:41:50 +01:00
Laurent Destailleur
34cfa0c6af Fix look and feel v11 2020-02-11 10:40:14 +01:00
Laurent Destailleur
05f0242198 NEW The info_admin() can show text after click on other text 2020-02-11 10:38:09 +01:00
Laurent Destailleur
7878fe49df Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-10 21:29:05 +01:00
Laurent Destailleur
ee7aa14247 Fix color of status 2020-02-10 21:28:49 +01:00
Laurent Destailleur
5823e2f5ef add warning 2020-02-10 20:57:55 +01:00
Laurent Destailleur
2756dc156d Add tool to convert pgdump into mysql dump 2020-02-10 20:35:18 +01:00
Laurent Destailleur
cab228ebbe Fix condition 2020-02-10 15:54:46 +01:00
Laurent Destailleur
bb40dbe1c3 Fix label of field 2020-02-10 15:53:28 +01:00
Laurent Destailleur
c22bc04608
Merge pull request #13075 from defrance/patch-146
NEW : Add "finished" field on product list
2020-02-10 15:40:29 +01:00
Laurent Destailleur
82f5482e25
Merge pull request #13071 from aspangaro/12.0_a13
NEW: Add accountancy code of thirdparty in supplier export
2020-02-10 15:40:09 +01:00
Laurent Destailleur
4973f49113
Merge pull request #13070 from aspangaro/12.0_a12
NEW: Add accountancy code of thirdparty in contact export
2020-02-10 15:38:45 +01:00
Laurent Destailleur
453315bc63
Merge pull request #13073 from RubenRuCh/11.0
FIX: #13018 Extrafields Supplier invoice
2020-02-10 15:38:17 +01:00
Laurent Destailleur
8604ff99ed
Merge pull request #13068 from andreubisquerra/develop
Add time tags to Receipt Printers module
2020-02-10 15:37:37 +01:00
Laurent Destailleur
3792b8c8c8 Fix quote pb reported by travis CI 2020-02-10 15:34:57 +01:00