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

1385 Commits

Author SHA1 Message Date
Laurent Destailleur
c62d147c60 Auto clean search field to avoid to have 2 conflict search criteria 2019-03-25 16:47:20 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Philippe GRAND
5677177ebc update with html5 compliant code 2019-03-19 13:45:50 +01:00
Philippe GRAND
d118d269a2 update with html5 compliant code 2019-03-19 13:44:21 +01:00
Laurent Destailleur
eab11ce743 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2019-03-19 13:14:44 +01:00
Laurent Destailleur
8664594fc8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:39 +01:00
Philippe Grand
2a91629e57
Update accountingaccount.class.php 2019-03-18 12:24:52 +01:00
Philippe GRAND
c98f3ae4b3 add comments 2019-03-18 10:20:24 +01:00
Laurent Destailleur
ae35c982af
Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit 
FIX : need to round with 2 decimals to avoid movements not correctly balanced
 2019-03-16 14:27:03 +01:00
Frédéric FRANCE
4822a2d396
Update accountancycategory.class.php 2019-03-16 09:51:57 +01:00
Laurent Destailleur
63b6900f2c Fix phpcs 2019-03-15 16:09:20 +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
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
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
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
Frédéric FRANCE
9b61577bf7
Update card.php 
It seems like GETPOST('fk_doc', 'int') of type string or string[] is incompatible with the declared type integer of property $fk_doc
 2019-03-10 21:04:35 +01:00
Alexandre SPANGARO
49f72b6a9a Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT 2019-03-09 05:50:16 +01:00
Alexandre SPANGARO
d926657534 FIX: Accountancy - Format EBP import 
Add doc
 2019-03-08 10:57:14 +01:00
Frédéric FRANCE
a836c75d70
replace html by html5 in accountancy 2019-03-03 10:31:46 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
 2019-03-02 18:30:17 +01:00
Frédéric FRANCE
e5e1a0b07d
The property $fk_doc was declared of type integer 2019-02-28 19:15:50 +01:00
Frédéric FRANCE
089875b8a2
add visibility 2019-02-27 17:53:52 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Laurent Destailleur
b33b3698c8
Merge pull request #10691 from aspangaro/develop 
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
 2019-02-27 02:18:20 +01:00
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2 2019-02-27 01:51:01 +01:00
Alexandre SPANGARO
1c59554806 NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX 2019-02-25 22:22:31 +01:00
Frédéric FRANCE
42a1387218
wip 2019-02-25 00:56:48 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
70350231ca
Update accountancycategory.class.php 2019-02-23 18:49:28 +01:00
Laurent Destailleur
cdf85b0d00 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-23 16:02:35 +01:00
Laurent Destailleur
9ba6e3f8f5 FIX #10638 2019-02-23 15:57:57 +01:00
Philippe GRAND
33164bcb3e fix : When comparing two booleans, it is generally considered safer to use the strict comparison operator. 2019-02-21 14:25:09 +01:00
Laurent Destailleur
acc0ac2c88 Fix line feed 2019-02-20 05:05:26 +01:00
Laurent Destailleur
d5c2984266
Merge pull request #10622 from aspangaro/10.0_portal2 
NEW: Add hooks in accountancy index
 2019-02-19 13:29:46 +01:00
Alexandre SPANGARO
49a975beb3 Update works 2019-02-18 07:14:21 +01:00
Alexandre SPANGARO
93a0cdd6d6 NEW: Add accounting account for result 
Use for closure workflow
 2019-02-18 06:00:21 +01:00
Alexandre SPANGARO
1b213ccbd6 NEW: Add hooks in accountancy index 2019-02-17 09:11:11 +01:00
Alexandre SPANGARO
5142d5b631 Fix also in binding page 2019-02-13 13:43:59 +01:00
Laurent Destailleur
205152501e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/public/payment/newpayment.php
 2019-02-12 13:39:39 +01:00
Laurent Destailleur
00eb95b660 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-12 13:36:32 +01:00
Laurent Destailleur
53a8f1cd3b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-12 13:36:05 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
9dc2a1f148
Update productaccount.php 2019-02-12 12:51:52 +01:00
Laurent Destailleur
53b2100dbb
Update productaccount.php 2019-02-12 12:50:36 +01:00
Alexandre SPANGARO
2dc4edb68c FIX: Accountancy - Add transaction with multicompany use all the time 1st entity 2019-02-11 11:36:12 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00