Commit Graph

264 Commits

Author SHA1 Message Date
Alexandre SPANGARO
14b9460de0 FIX Sens of the balance (Debit - Credit in accountancy not contrary) 2019-08-29 16:27:25 +02:00
Alexandre SPANGARO
a2fc3689da Nowrap on amount 2019-07-28 22:59:43 +02:00
Alexandre SPANGARO
99b068b625 FIX sortfield on lettering function 2019-05-05 21:46:56 +02:00
Laurent Destailleur
6797c95164 Fix syntax error 2019-05-03 12:10:29 +02:00
Alexandre SPANGARO
7bd99c0eee fix 2019-05-02 14:08:28 +02:00
Alexandre SPANGARO
cbe23741eb FIX Massive debug in lettering function 2019-05-02 14:06:55 +02:00
Alexandre SPANGARO
ba34b601b3 FIX: MultiEntity in lettering functionality 2019-04-04 16:44:36 +02: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
gauthier
2142ccee8a FIX : better method 2019-02-08 15:17:40 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91 FIX #9629 #9625 2018-12-14 10:31:09 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
florian HENRY
38059ed60d fix #10006 2018-12-01 00:39:37 +01:00
Alexandre SPANGARO
9154fd366f Fix create accounting account from balance 2018-11-24 22:30:06 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Alexandre SPANGARO
af1305a0a8 Fix Specific finename for FEC export only available on general ledger export 2018-11-01 07:24:48 +01:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
612e3a9805 Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr
into aspangaro-9.0_accountancy

# Conflicts:
#	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
#	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
#	htdocs/accountancy/class/lettering.class.php
2018-10-24 02:54:57 +02:00
Laurent Destailleur
769bae75e9
Update list.php 2018-10-24 02:48:38 +02:00
Laurent Destailleur
fe665a060d
Merge branch 'develop' into patch-17 2018-10-24 01:42:02 +02:00
Alexandre SPANGARO
930dce7611 change class name from lettering to Lettering 2018-10-22 06:39:23 +02:00
Alexandre SPANGARO
3f79580b19 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-22 06:33:34 +02:00
Laurent Destailleur
2816bdf747 FIX Date into filename of FEC file. 2018-10-21 16:22:56 +02:00
Frédéric FRANCE
02954931d8
Update thirdparty_lettrage_supplier.php 2018-10-20 16:27:15 +02:00
Frédéric FRANCE
d3022413ef
Update thirdparty_lettrage.php 2018-10-20 16:25:57 +02:00
Alexandre SPANGARO
a7de7013a1 Update code 2018-10-20 11:20:53 +02:00
Alexandre SPANGARO
921757c4a3 Fix travis 2018-10-20 10:57:59 +02:00
Alexandre SPANGARO
5cbcef4465 Debug Lettering 2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-20 06:35:39 +02:00
Laurent Destailleur
4571210bcf Fix remove deprecated field 2018-10-19 15:45:56 +02:00
Alexandre SPANGARO
a466104b81 Fix FEC on transaction card
Fix for FEC compliance
- Remove useless column label_compte
- label_compte is generated with label of accounting account number
- Insert also the label of the journal
2018-10-17 07:20:04 +02:00
Alexandre SPANGARO
a5ebcff2ee Fix lettering function 2018-10-16 22:27:34 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Laurent Destailleur
2684767b19 Fix pagination
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
2018-10-15 11:08:40 +02:00
Laurent Destailleur
aa6996e2d0 Fix pagination show two times the same account on balance of accounts 2018-10-15 11:07:07 +02:00
Laurent Destailleur
35eeb32f5d Fix pagination 2018-10-15 00:08:28 +02:00
Laurent Destailleur
b13d9650f2 Fix pagination 2018-10-15 00:06:16 +02:00
Laurent Destailleur
8fc73d1b1b Fix pagination show two times the same account on balance of accounts 2018-10-14 23:47:38 +02:00
Philippe GRAND
5dd447445a html5 2018-10-14 09:43:33 +02:00
Philippe GRAND
18b3238bad Standardize and update code 2018-10-12 16:56:01 +02:00
Laurent Destailleur
6c55bfc0f7 Fix export and remove duplicate csv export. 2018-10-10 19:45:26 +02:00
gauthier
d6a9da57e1 FIX : need to round with 2 decimals to avoid movements not correctly balanced 2018-10-01 14:11:19 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Philippe GRAND
5a4524451c standardize 2018-07-28 14:02:33 +02:00
Frédéric FRANCE
c991a4d204
trim trailing 2018-07-26 18:05:20 +02:00