Commit Graph

74359 Commits

Author SHA1 Message Date
Regis Houssin
fd393218d3 FIX you should prefer "elseif" than "else if" 2019-03-14 17:07:49 +01:00
Regis Houssin
daa940d75b FIX multiple bugs for show products/categories 2019-03-14 16:35:36 +01:00
Laurent Destailleur
3ab5c3e6ab FIX Edit of personalized groups 2019-03-14 16:03:37 +01:00
Laurent Destailleur
7f23a396a9
Merge pull request #10794 from aspangaro/10.0_AccountancyMenuV2
NEW: Accounting - More comprehensive menu
2019-03-14 14:29:01 +01:00
Laurent Destailleur
77c69aa155
Merge pull request #10823 from joseplluis/patch-4
FIX: free product description not printed on receipt
2019-03-14 14:21:48 +01:00
Laurent Destailleur
58fa1292f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-14 14:20:42 +01:00
Laurent Destailleur
39e6e71b0d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2019-03-14 14:20:34 +01:00
Laurent Destailleur
3073567763 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 14:17:52 +01:00
Laurent Destailleur
017b7d6696
Merge pull request #10814 from atm-florian/develop
fix missing test on method result
2019-03-14 14:16:59 +01:00
Laurent Destailleur
b65c791043 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 14:15:45 +01:00
Laurent Destailleur
d7735ff272 FIX #10822 2019-03-14 14:15:35 +01:00
Laurent Destailleur
3c40d5d30c
Merge pull request #10821 from OPEN-DSI/fix-select-measuring-units
Fix measure unit id in select options
2019-03-14 14:10:13 +01:00
Laurent Destailleur
993183aec6
Merge pull request #10817 from wdammak/patch-35
Fix Warning: Invalid argument - dynamic_price
2019-03-14 14:09:21 +01:00
Laurent Destailleur
7b8b6bb02f
Merge pull request #10804 from hregis/9.0_merge
FIX possibility to set up payment mode when invoice module is disabled
2019-03-14 14:09:00 +01:00
Laurent Destailleur
9e66e8329c
Merge pull request #10818 from defrance/patch-140
replace "brouillonner" by "setdraft"
2019-03-14 14:05:11 +01:00
Laurent Destailleur
9f6610a421
Merge pull request #10831 from frederic34/patch-5
phpcs fix
2019-03-14 14:04:44 +01:00
florian HENRY
9bcb91a122 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-14 13:02:09 +01:00
Laurent Destailleur
f8a4d9075b Fix css for fontawesome 5 2019-03-14 11:48:25 +01:00
Frédéric FRANCE
9be780f47d
Update style.css.php 2019-03-14 09:18:51 +01:00
Frédéric FRANCE
bb14562f7b
Update global.inc.php 2019-03-14 09:17:40 +01:00
Frédéric FRANCE
ba749ffc8c
Update product.class.php 2019-03-14 09:14:29 +01:00
Frédéric FRANCE
965f5861b3
Update commoninvoice.class.php 2019-03-14 09:10:26 +01:00
Laurent Destailleur
7e31e6b4f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
c3c7e3c1fb Remove warning on date 2019-03-13 19:08:45 +01:00
Laurent Destailleur
fcbd39fda9 Fix typo 2019-03-13 19:07:19 +01:00
Laurent Destailleur
e7cd8d690c Remove warnings 2019-03-13 19:06:45 +01:00
Laurent Destailleur
e0208cb3d6 Generation of PDF doc 2019-03-13 18:11:15 +01:00
Josep Lluís
869f6680da
FIX: free product description not printed
The description of a free product/service is not printed on receipt.
2019-03-13 15:43:34 +01:00
Laurent Destailleur
ae6b672204 Look and feel v10 2019-03-13 15:04:38 +01:00
Laurent Destailleur
1bd9d6a8e5 Fix font awesome 5 picto for notes 2019-03-13 15:02:43 +01:00
Laurent Destailleur
9da84f68c7 Bad language file for civility order 2019-03-13 14:23:27 +01:00
Laurent Destailleur
eeafc3c630 Standardize translation of amount 2019-03-13 14:10:36 +01:00
Lionel VESSILLER
17dd88d397 Fix measure unit id in select options 2019-03-13 14:05:32 +01:00
Laurent Destailleur
68cc7f0e89 Fix css 2019-03-13 13:53:29 +01:00
Laurent Destailleur
c32551cb62 Fix size of varchar 2019-03-13 13:42:14 +01:00
Laurent Destailleur
88c02143fa Fix missing fields 2019-03-13 13:40:57 +01:00
Laurent Destailleur
10f572b400 Remove warning 2019-03-13 11:13:03 +01:00
Laurent Destailleur
0e1479ef4e Lang 2019-03-13 11:04:14 +01:00
BENKE Charlene
fef1f06d14
Update card.php 2019-03-13 10:15:32 +01:00
BENKE Charlene
79bb613285
Update card.php 2019-03-13 10:12:25 +01:00
BENKE Charlene
5e78907292
replace "brouillonner" by "setdraft" 2019-03-13 10:09:17 +01:00
wdammak
b651b7ec07
Fix Warning: Invalid argument - dynamic_price 2019-03-13 01:03:12 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Laurent Destailleur
d33fb9eff0 Work on BOM module 2019-03-12 19:30:32 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Laurent Destailleur
c2063c5d0b Fix bad translation 2019-03-12 18:24:55 +01:00
Laurent Destailleur
fe6b682ec0 NEW Add visibility with value 4 in framework to define fields to show on
forms and list but not on creation forms.
2019-03-12 17:45:19 +01:00
florian HENRY
9968fae9dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-12 17:25:00 +01:00
Laurent Destailleur
30c327c702 CSS 2019-03-12 17:19:58 +01:00
Laurent Destailleur
a50e2898eb Fix bom 2019-03-12 13:09:31 +01:00