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

74512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c72cd7e750
Merge pull request #10807 from altatof/ste 
change add_commercial function signature
 2019-03-15 19:26:12 +01:00
Laurent Destailleur
875b5b6a8d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/opensurvey/studs.php
 2019-03-15 19:20:22 +01:00
Laurent Destailleur
39e24d30aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:18:30 +01:00
Laurent Destailleur
681d626284 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:17:31 +01:00
Laurent Destailleur
4bb45ad1c1
Merge pull request #10824 from atm-gauthier/7.0_fix_nocreateline_deposit_if_amount_zero 
FIX : when we create deposit with multi tva, we mustn't add line if a…
 2019-03-15 19:16:56 +01:00
Laurent Destailleur
b33c366b02
Update card.php 2019-03-15 19:16:49 +01:00
Laurent Destailleur
2e94f8043f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:14:02 +01:00
Laurent Destailleur
abf529770d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:13:23 +01:00
Laurent Destailleur
482a37a2c9
Merge pull request #10850 from atm-ph/fix_7.0_var_name 
Fix var name
 2019-03-15 19:12:55 +01:00
Laurent Destailleur
a1adcc785c Clean code 2019-03-15 19:11:24 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
6ecd37ea8f WIP Clean code of BOM 2019-03-15 18:16:25 +01:00
Laurent Destailleur
fd1e917edc Implement fetchLines in BOM 2019-03-15 18:14:46 +01:00
Laurent Destailleur
d075e97ba6 Remove warnings 2019-03-15 18:09:44 +01:00
Laurent Destailleur
ab4076c54a WIP Work on BOM module 2019-03-15 18:06:26 +01:00
Laurent Destailleur
bca18f22ae Prepare link with expense report line and document 2019-03-15 16:23:38 +01:00
Laurent Destailleur
63b6900f2c Fix phpcs 2019-03-15 16:09:20 +01:00
Laurent Destailleur
82a9ac4f65 Fix phpcs 2019-03-15 16:07:08 +01:00
Laurent Destailleur
0126303fae Fix new line on description of expense report 2019-03-15 16:05:50 +01:00
Laurent Destailleur
6f0fbc42c1 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/members/new.php
	htdocs/public/opensurvey/studs.php
 2019-03-15 15:16:29 +01:00
atm-ph
2da60fb885 Fix var name 2019-03-15 15:15:03 +01:00
Laurent Destailleur
e5c08978c3 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 2019-03-15 15:13:28 +01:00
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