Commit Graph

65189 Commits

Author SHA1 Message Date
Laurent Destailleur
5aee322b30
Update fournisseurs.php 2019-03-14 18:36:05 +01:00
Laurent Destailleur
4f84a1614c
Merge pull request #10808 from ATM-Marc/FIX_8.0_shipment_hooks
FIX: several hooks in shipping/delivery cards
2019-03-14 18:07:57 +01:00
Laurent Destailleur
0afbd70c2c
Merge pull request #10833 from grandoc/new_branch_14_03_2019
update with html5 compliant code
2019-03-14 18:04:06 +01:00
Regis Houssin
56104e6d89 FIX regression 2019-03-14 17:58:32 +01:00
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
gauthier
3fb6978bc8 FIX : no need to test anything to display documents tabs on expense report 2019-03-14 17:36:49 +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
Regis Houssin
a40cba194f FIX wrong url 2019-03-14 17:24:42 +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
gauthier
885797b748 FIX : useless join 2019-03-14 17:00:51 +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
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
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +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
Philippe GRAND
3d65b887a7 update with html5 compliant code 2019-03-14 14:34:33 +01:00
Philippe GRAND
719ecde6e9 update with html5 compliant code 2019-03-14 14:34:04 +01:00
Philippe GRAND
756bdfc6a8 update with html5 compliant code 2019-03-14 14:33:36 +01:00
Philippe GRAND
9ee27936f7 update with html5 compliant code 2019-03-14 14:33:00 +01:00
Philippe GRAND
ad9f75d3e9 update with html5 compliant code 2019-03-14 14:32:26 +01:00
Philippe GRAND
80858b39d9 update with html5 compliant code 2019-03-14 14:31:40 +01:00
Philippe GRAND
f71769e0e6 update with html5 compliant code 2019-03-14 14:31:08 +01:00
Philippe GRAND
f13d520830 update with html5 compliant code 2019-03-14 14:30:41 +01:00
Philippe GRAND
b4a9b3aa20 update with html5 compliant code 2019-03-14 14:30:08 +01:00
Philippe GRAND
5977cdad26 update with html5 compliant code 2019-03-14 14:29:16 +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
Philippe GRAND
6c4070eb87 update with html5 compliant code 2019-03-14 14:28:36 +01:00
Philippe GRAND
310670b3f6 update with html5 compliant code 2019-03-14 14:27:54 +01:00
Philippe GRAND
f082bd3e96 update with html5 compliant code 2019-03-14 14:27:16 +01:00
Philippe GRAND
af4edbba2b update with html5 compliant code 2019-03-14 14:26:43 +01:00
Philippe GRAND
d21dbe915b update with html5 compliant code 2019-03-14 14:26:08 +01:00
Philippe GRAND
6b878a2c64 update with html5 compliant code 2019-03-14 14:25:21 +01:00
Philippe GRAND
27b7ec8202 update with html5 compliant code 2019-03-14 14:24:17 +01:00
Laurent Destailleur
feaca165ad
Merge pull request #10809 from joanlouis/fix-extrafields-calls-from-cards-8
Fix extrafields calls from cards for Dolibarr 8 See #10803
2019-03-14 14:22:31 +01:00
Philippe GRAND
d506cf7700 update with html5 compliant code 2019-03-14 14:21:54 +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
Philippe GRAND
68c6c0513d update with html5 compliant code 2019-03-14 14:20:32 +01:00
Philippe GRAND
38822a9bb1 update with html5 compliant code 2019-03-14 14:18:44 +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
Philippe GRAND
6984cd25d8 update with html5 compliant code 2019-03-14 14:11:43 +01:00
Philippe GRAND
0832e9873c update with html5 compliant code 2019-03-14 14:10:41 +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
Philippe GRAND
63b1a1459b update with html5 compliant code 2019-03-14 14:09:54 +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
Philippe GRAND
43b827aae7 update with html5 compliant code 2019-03-14 14:07:26 +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
Philippe GRAND
7dcdbe6477 update with html5 compliant code 2019-03-14 14:04:57 +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
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