Commit Graph

86754 Commits

Author SHA1 Message Date
Je2fb
fa32618fe9
Update card.php
If rate change is modify, the currency price is taken in place of the price from the main currency
2020-03-31 18:58:59 +02:00
Laurent Destailleur
6f0071bebe FIX sort on company on member list 2020-03-31 17:54:48 +02:00
Laurent Destailleur
b407797ca3 Fix css 2020-03-31 17:45:45 +02:00
Fabian Palacios
ae4fb855d7 chart of accounts to Ecuador 2020-03-31 10:10:22 -05:00
Fabian Palacios
db18226493 Chart of accounts to Ecuador 2020-03-31 10:08:37 -05:00
ATM john
79fe664365 fix merge not applied 2020-03-31 16:43:38 +02:00
stickler-ci
004d9381f5 Fixing style errors. 2020-03-31 14:36:42 +00:00
ATM john
fdffbf42f9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-03-31 16:33:47 +02:00
ATM john
035bb671f2 Fix sql ; missing 2020-03-31 16:32:07 +02:00
Fabian Palacios
3797080ab5 #13446 fix loop for dislplay of OthersNotLinkedToThirdParty 2020-03-31 09:29:59 -05:00
ATM john
c466beea3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-03-31 16:28:43 +02:00
Laurent Destailleur
766f480741 css 2020-03-31 16:24:33 +02:00
stickler-ci
1f5da36fdb Fixing style errors. 2020-03-31 13:02:44 +00:00
atm-quentin
e3dfe60567 uniformize update buyprice + some fixes 2020-03-31 14:53:15 +02:00
Laurent Destailleur
f09321a497 css 2020-03-31 13:57:19 +02:00
Laurent Destailleur
e75e49426f Look and feel v12 2020-03-31 13:52:02 +02:00
Laurent Destailleur
0b486ea5ad CSS 2020-03-31 13:28:19 +02:00
Laurent Destailleur
e0d713bbef Update demo 2020-03-31 12:56:21 +02:00
florian HENRY
5658d783d6 fix advtargetemailing : fatal call to static attribut (that is not static: table_element) 2020-03-31 12:04:34 +02:00
oscim
3b8a16e3fd
Update modCommande.class.php
add extrafileds company in export orders
2020-03-31 11:05:21 +02:00
stickler-ci
5a62da101d Fixing style errors. 2020-03-31 09:04:46 +00:00
atm-quentin
73f6c9210f FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL 2020-03-31 11:03:08 +02:00
oscim
f66c90ca8b
Update expedition.class.php
report usage multicurrency of thirdparty in fetch method expedition for use in other  process
2020-03-31 10:57:52 +02:00
stickler-ci
24c5f57da2 Fixing style errors. 2020-03-31 08:56:26 +00:00
oscim
5895858546
Update expedition.class.php
report fk_unit line in fetch_line methode
2020-03-31 10:54:14 +02:00
gauthier
04564e83ea FIX : picture migration script from doli 9.0 2020-03-31 10:31:18 +02:00
stickler-ci
fb80199713 Fixing style errors. 2020-03-31 07:23:36 +00:00
oscim
3a95beac66
Update livraison.class.php
add in fetch_lines method item for determine weight and dimension , and unit for all lines
2020-03-31 09:20:48 +02:00
Laurent Destailleur
0b1cfcc0cc Fix phpcs 2020-03-31 00:13:27 +02:00
Laurent Destailleur
353d561060 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-31 00:11:46 +02:00
Laurent Destailleur
416d1ce3f0 Fix phpcs 2020-03-31 00:11:31 +02:00
stickler-ci
7409642636 Fixing style errors. 2020-03-30 19:12:29 +00:00
ptibogxiv
fbf7375fe5
NEW compatibility of translabel with more dict 2020-03-30 21:10:27 +02:00
jove@bisquerra.com
d9614ac6fc Integrate Cash Control in TakePOS 2020-03-30 20:05:45 +02:00
Laurent Destailleur
2e1fe7b989
Merge pull request #13451 from andreubisquerra/develop
Log CUPS print error on Receipt Printer module
2020-03-30 20:02:56 +02:00
Laurent Destailleur
5f8d9fc8e8
Merge pull request #13347 from bafbes/abb60311
NEW:Show units of products in stocks and hide total units if content is of diffents units
2020-03-30 20:01:59 +02:00
Laurent Destailleur
774137b937
Update card.php 2020-03-30 20:00:59 +02:00
Laurent Destailleur
401265d09e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:56:59 +02:00
Laurent Destailleur
3860f24908 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:56:31 +02:00
Laurent Destailleur
d0c179e1e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:54:32 +02:00
Laurent Destailleur
878c4fb106 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-30 19:53:40 +02:00
Laurent Destailleur
fbce8fcfe3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-03-30 19:46:23 +02:00
Laurent Destailleur
474260e526
Merge pull request #13447 from c3do/patch-1
Fix can set desiredstock to (int) 0 from API Rest
2020-03-30 19:46:02 +02:00
Laurent Destailleur
0b7b97ec34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:43:03 +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
6ecacb9c29 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:38:07 +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