2
0
forked from Wavyzz/dolibarr
Commit Graph

1863 Commits

Author SHA1 Message Date
Alexandre SPANGARO
6f9e71dae3 Merge remote-tracking branch 'upstream/develop' into 10.0_closure2 2019-04-24 21:15:54 +02:00
Laurent Destailleur
4421dedbd2 Merge pull request #11008 from aspangaro/10.0_closure
FIX: Update blocked by datec on fiscal year
2019-04-24 10:28:23 +02:00
Laurent Destailleur
74d0edfc59 Removed not used file 2019-04-23 13:24:32 +02:00
Laurent Destailleur
a8b645c7a3 Fix warnings 2019-04-23 13:07:46 +02:00
Laurent Destailleur
7c458ee4c0 TODO 2019-04-23 13:02:25 +02:00
Laurent Destailleur
1c90d157a0 Look and feel v10 2019-04-19 18:45:01 +02:00
Laurent Destailleur
94ca74b37e Merge pull request #11009 from bafbes/abb90047
fix:Select chart plan from active countries only 2829bfc
2019-04-19 13:12:00 +02:00
Laurent Destailleur
6d34a38042 Update account.php 2019-04-19 13:11:50 +02:00
Laurent Destailleur
cb8f9cc120 Fix link 2019-04-19 12:37:55 +02:00
Laurent Destailleur
87eb5f5c02 Fix filter lost 2019-04-19 12:36:32 +02:00
Laurent Destailleur
61428b9c00 Fix use standard product country code if country of buyer not defined 2019-04-19 12:19:45 +02:00
Laurent Destailleur
eab474e23a Update list.php 2019-04-19 12:10:40 +02:00
Laurent Destailleur
265671a5f3 Update list.php 2019-04-19 12:00:06 +02:00
Alexandre SPANGARO
033e9b9f22 FIX Accounting Customer dispatch with intra/export 2019-04-19 06:48:51 +02:00
Alexandre SPANGARO
660a1cea1d NEW Accounting - Add rights on export, delete operations in ledger 2019-04-17 07:26:39 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
Alexandre SPANGARO
9957b8aed5 WIP - FEC - Validate 2019-04-15 09:07:36 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Abbes Bahfir
2829bfc84f fix:Select chart plan from active countries only 2019-04-14 17:36:16 +01:00
Alexandre SPANGARO
c1ecfae6f2 FIX: Update on fiscal year 2019-04-13 22:46:40 +02:00
Laurent Destailleur
b8d3110266 Merge pull request #10916 from frederic34/patch-2
Update EBP export
2019-04-11 16:56:16 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
321ffb859b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
2019-04-08 14:09:18 +02:00
Alexandre SPANGARO
ba34b601b3 FIX: MultiEntity in lettering functionality 2019-04-04 16:44:36 +02:00
Alexandre SPANGARO
6f1b496373 Merge remote-tracking branch 'upstream/develop' into 10.0_WARNING 2019-03-28 11:57:59 +01:00
Laurent Destailleur
c62d147c60 Auto clean search field to avoid to have 2 conflict search criteria 2019-03-25 16:47:20 +01:00
Frédéric FRANCE
f9c1289a5b Update EBP export
@aspangaro @Darkjeff can you confirm that montant must be always >0 (in case of credit)
2019-03-25 14:52:30 +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
dbe15d3685 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:17 +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
895367060c Fix some small error 2019-03-09 05:31:05 +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