Laurent Destailleur
|
8f65ee2296
|
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
|
2019-03-14 17:48:44 +01:00 |
|
Laurent Destailleur
|
f50638b7d8
|
Update html.form.class.php
|
2019-03-14 17:44:54 +01:00 |
|
Laurent Destailleur
|
60db66d2bf
|
Update fournisseur.product.class.php
|
2019-03-14 17:41:33 +01:00 |
|
Laurent Destailleur
|
250e0bbaac
|
Update fournisseur.product.class.php
|
2019-03-14 17:40:39 +01:00 |
|
Laurent Destailleur
|
dd962fa044
|
Update fournisseur.product.class.php
|
2019-03-14 17:39:01 +01:00 |
|
Laurent Destailleur
|
69bfac7eef
|
Update html.form.class.php
|
2019-03-14 17:36:35 +01:00 |
|
Laurent Destailleur
|
c6b3d81d61
|
Update html.form.class.php
|
2019-03-14 17:35:44 +01:00 |
|
Laurent Destailleur
|
d4f2a16abf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
|
2019-03-14 17:10:58 +01:00 |
|
Laurent Destailleur
|
4a9694782c
|
phpcs
|
2019-03-14 17:08:45 +01:00 |
|
Laurent Destailleur
|
e414d210fb
|
Merge pull request #10837 from hregis/develop_takepos
FIX multiple bugs for show products/categories
|
2019-03-14 17:07:53 +01:00 |
|
Laurent Destailleur
|
8a752ae657
|
Merge pull request #10744 from OPEN-DSI/fix-show-action-done-sortfield
Fix sort by field in all events (action and emailing type)
|
2019-03-14 17:00:12 +01:00 |
|
Laurent Destailleur
|
be0535d11f
|
Merge pull request #10805 from frederic34/patch-2
update doc
|
2019-03-14 16:55:29 +01:00 |
|
Laurent Destailleur
|
42de3a0cde
|
Merge pull request #10838 from atm-john/9.0_missing_hook_export_agenda
FIX missing hook in agenda export
|
2019-03-14 16:54:55 +01:00 |
|
Frédéric FRANCE
|
b67429218d
|
Update html.formmail.class.php
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2019-03-14 16:52:16 +01:00 |
|
Laurent Destailleur
|
965f4702b0
|
Merge pull request #10830 from frederic34/patch-4
Update html.formmail.class.php
|
2019-03-14 16:49:34 +01:00 |
|
Laurent Destailleur
|
09d015c14c
|
Merge pull request #10836 from frederic34/patch-5
phpcs fix
|
2019-03-14 16:47:16 +01:00 |
|
Laurent Destailleur
|
bcf0dd0168
|
Merge branch 'develop' into patch-5
|
2019-03-14 16:47:08 +01:00 |
|
Frédéric FRANCE
|
f25ce3b40c
|
Update facture.php
|
2019-03-14 16:43:52 +01:00 |
|
Laurent Destailleur
|
c906ae3860
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-14 16:43:37 +01:00 |
|
Laurent Destailleur
|
cdf6e4b65a
|
Fix some PSR rules
|
2019-03-14 16:43:27 +01:00 |
|
Laurent Destailleur
|
b1032f838c
|
Fix some PSR rules
|
2019-03-14 16:43:19 +01:00 |
|
Frédéric FRANCE
|
321a919fb1
|
Update result.php
|
2019-03-14 16:42:35 +01:00 |
|
Frédéric FRANCE
|
1222d90537
|
phpcs fix
|
2019-03-14 16:40:44 +01:00 |
|
Regis Houssin
|
daa940d75b
|
FIX multiple bugs for show products/categories
|
2019-03-14 16:35:36 +01:00 |
|
Laurent Destailleur
|
a0d8ba268e
|
Update doc with the new menu entries
|
2019-03-14 16:28:32 +01:00 |
|
Laurent Destailleur
|
8410d59182
|
FIX Missing field "In sale" in list
|
2019-03-14 16:16:50 +01:00 |
|
John BOTELLA
|
31e588dbab
|
fix hookmanager global
|
2019-03-14 16:13:32 +01:00 |
|
Laurent Destailleur
|
5ccfba1210
|
FIX Edit of personalized groups
Conflicts:
htdocs/accountancy/admin/categories.php
|
2019-03-14 16:06:20 +01:00 |
|
Laurent Destailleur
|
3ab5c3e6ab
|
FIX Edit of personalized groups
|
2019-03-14 16:03:37 +01:00 |
|
John BOTELLA
|
8bc795c055
|
Fix missing hook for export agenda
|
2019-03-14 15:19:38 +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 |
|
Frédéric FRANCE
|
d8599b52d9
|
Update html.formmail.class.php
|
2019-03-14 08:19:22 +01:00 |
|