Philippe GRAND
|
89da4fbdc1
|
update with html5 compliant code
|
2019-03-15 09:49:07 +01:00 |
|
Philippe GRAND
|
7c916666a6
|
update with html5 compliant code
|
2019-03-15 09:48:32 +01:00 |
|
Philippe GRAND
|
81510717ce
|
update with html5 compliant code
|
2019-03-15 09:47:56 +01:00 |
|
Philippe GRAND
|
cd168a951a
|
update with html5 compliant code
|
2019-03-15 09:46:39 +01:00 |
|
Philippe GRAND
|
2e4bf72382
|
update with html5 compliant code
|
2019-03-15 09:45:48 +01:00 |
|
Philippe GRAND
|
3d93fba4b8
|
update with html5 compliant code
|
2019-03-15 09:45:01 +01:00 |
|
Philippe GRAND
|
404872298f
|
update with html5 compliant code
|
2019-03-15 09:44:17 +01:00 |
|
Philippe GRAND
|
f028f74c7c
|
update with html5 compliant code
|
2019-03-15 09:43:33 +01:00 |
|
Philippe GRAND
|
6536efa81c
|
update with html5 compliant code
|
2019-03-15 09:41:56 +01:00 |
|
Philippe GRAND
|
2463ee47ba
|
update with html5 compliant code
|
2019-03-15 09:40:52 +01:00 |
|
Laurent Destailleur
|
99e67bcc21
|
Fix phpcs
|
2019-03-15 02:48:13 +01:00 |
|
Laurent Destailleur
|
7c59629e66
|
Fix phpcs
|
2019-03-15 02:32:21 +01:00 |
|
Laurent Destailleur
|
86c5dc20e3
|
NEW Can choose the root category to show for TakePOS module
|
2019-03-15 02:12:40 +01:00 |
|
Laurent Destailleur
|
0ef6fd36f9
|
Merge and clean TakePOS CSS
|
2019-03-15 00:49:44 +01:00 |
|
Laurent Destailleur
|
ca31f654e7
|
Reduce text for graph title
|
2019-03-14 23:42:22 +01:00 |
|
Laurent Destailleur
|
6aa9a5f13a
|
Fix link to backoffice
|
2019-03-14 23:36:55 +01:00 |
|
Laurent Destailleur
|
c44d9bf8e2
|
Fix phpcs
|
2019-03-14 23:27:50 +01:00 |
|
Laurent Destailleur
|
f865d1c378
|
Merge pull request #10840 from hregis/develop_takepos
FIX wrong url
|
2019-03-14 19:26:16 +01:00 |
|
Laurent Destailleur
|
f9d76c372d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-14 19:24:11 +01:00 |
|
Laurent Destailleur
|
5be2c45d61
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/card.php
htdocs/expedition/shipment.php
htdocs/livraison/card.php
|
2019-03-14 19:23:59 +01:00 |
|
Laurent Destailleur
|
51de29458f
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-14 19:06:31 +01:00 |
|
Laurent Destailleur
|
a35a2faacb
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/expedition/card.php
htdocs/livraison/card.php
|
2019-03-14 19:06:21 +01:00 |
|
Laurent Destailleur
|
a8bd8a2101
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-14 18:49:24 +01:00 |
|
Laurent Destailleur
|
5ec8adb7f5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-03-14 18:48:35 +01:00 |
|
Laurent Destailleur
|
40bf2c21b7
|
Merge pull request #8831 from tiaris/dev_datepricefour
NEW Adding code to show update date of supplier price shown
|
2019-03-14 18:44:38 +01:00 |
|
Laurent Destailleur
|
2e270d95e9
|
Update suppliers.lang
|
2019-03-14 18:44:03 +01:00 |
|
Laurent Destailleur
|
911962ec12
|
Update suppliers.lang
|
2019-03-14 18:43:51 +01:00 |
|
Laurent Destailleur
|
2713c430df
|
Merge branch 'develop' into dev_datepricefour
|
2019-03-14 18:43:09 +01:00 |
|
Laurent Destailleur
|
463c83efec
|
Update fournisseur.product.class.php
|
2019-03-14 18:37:03 +01:00 |
|
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
|
88f9f33c2a
|
Merge pull request #10703 from atm-quentin/NEW_develop_supplier_buyprice_barcode
NEW Support barcode on supplier price references
|
2019-03-14 17:49:10 +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 |
|
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 |
|
Regis Houssin
|
f43f3e0038
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_takepos
|
2019-03-14 17:24:14 +01:00 |
|
Laurent Destailleur
|
eab1e13343
|
Merge pull request #10839 from atm-gauthier/6.0_fix_useless_join
FIX : useless join
|
2019-03-14 17:12:38 +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 |
|
Regis Houssin
|
39b2298270
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_takepos
|
2019-03-14 17:09:38 +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 |
|
Regis Houssin
|
fd393218d3
|
FIX you should prefer "elseif" than "else if"
|
2019-03-14 17:07:49 +01:00 |
|
gauthier
|
885797b748
|
FIX : useless join
|
2019-03-14 17:00:51 +01:00 |
|