lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
74,485 Commits 43 Branches 150 Tags 886 MiB
413ecd1d68
Commit Graph

74485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
413ecd1d68 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-15 15:08:09 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
1f02b74fee
Merge pull request #10843 from grandoc/new_branch_html5 
update with html5 compliant code
 2019-03-15 12:30:09 +01:00
Laurent Destailleur
d2c7fe3a6f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-15 11:06:54 +01:00
Laurent Destailleur
d31b632d96 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
 2019-03-15 11:06:49 +01:00
Laurent Destailleur
074ba0729a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 11:00:52 +01:00
Laurent Destailleur
84bff41543 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 11:00:24 +01:00
Laurent Destailleur
6c2cad3d48 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/security.lib.php
 2019-03-15 11:00:00 +01:00
Laurent Destailleur
8711e51bce
Merge pull request #10841 from atm-gauthier/6.0_notest_tab_documents_on_expensereport 
FIX : no need to test anything to display documents tabs on expense report
 2019-03-15 10:56:53 +01:00
Laurent Destailleur
ff1fc4fb59
Merge pull request #10845 from OPEN-DSI/fix-contrat-card-date 
Fix dol_print_date error for real dates in cotract card
 2019-03-15 10:50:34 +01:00
Laurent Destailleur
e326c4d579 Look and feel v10 2019-03-15 10:48:10 +01:00
gauthier
8375b47e74 FIX : in fact expensereport must be in $check array 2019-03-15 10:21:50 +01:00
Laurent Destailleur
32767a487b FIX Missing id in call of restrictedArea for expense report card.php 2019-03-15 10:18:58 +01:00
Lionel VESSILLER
971037d755 Fix dol_print_date error for real dates in cotract card 2019-03-15 08:42:00 +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
Philippe GRAND
dc8de23c1a update with html5 compliant code 2019-03-14 19:21:27 +01:00
Philippe GRAND
3f0bd79324 update with html5 compliant code 2019-03-14 19:17:59 +01:00
Philippe GRAND
a479d536c5 update with html5 compliant code 2019-03-14 19:17:00 +01:00
Philippe GRAND
6fb85c0930 update with html5 compliant code 2019-03-14 19:09:02 +01:00
Philippe GRAND
133997b195 update with html5 compliant code 2019-03-14 19:07:22 +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
Philippe GRAND
33aa7fa309 update with html5 compliant code 2019-03-14 19:06:30 +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
Philippe GRAND
309514c15c update with html5 compliant code 2019-03-14 19:03:58 +01:00
Philippe GRAND
9f420bdd08 update with html5 compliant code 2019-03-14 19:02:37 +01:00
Philippe GRAND
c61fbcf190 update with html5 compliant code 2019-03-14 19:01:47 +01:00
Philippe GRAND
e3e8e66005 update with html5 compliant code 2019-03-14 19:00:12 +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