Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,061 Commits 36 Branches 190 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

380 Commits

Author SHA1 Message Date
elarifr
c7129cdd71 quadra format date is wrong 
need amount in cent without decimal symbol
need to remove accent as it give two ascii and break import
 2017-11-19 19:42:16 +01:00
Laurent Destailleur
6608dd72bd Merge pull request #7776 from frederic34/exportadmin 
correct merge
 2017-11-11 17:23:42 +01:00
Laurent Destailleur
d938a56282 Clean code 2017-11-11 01:10:17 +01:00
Frédéric FRANCE
45afbae49c some change 2017-11-07 10:47:58 +01:00
Frédéric FRANCE
ea910adeb2 Merge branch 'develop' into accountingexport 2017-11-05 21:11:41 +01:00
Frédéric FRANCE
bb252846e3 accounting export admin config 2017-11-05 11:48:41 +01:00
Laurent Destailleur
417642ba39 Standardize interface (search on date modification) 2017-11-02 10:33:04 +01:00
Alexandre SPANGARO
f9e801b4a7 Update works 2017-11-01 08:42:17 +01:00
Alexandre SPANGARO
7c0ff3a32f Merge remote-tracking branch 'uptream/develop' into 7.0-general_ledger 2017-11-01 07:58:20 +01:00
Alexandre SPANGARO
7a719c6be6 NEW General ledger : Add field and selected field 2017-10-29 05:37:50 +01:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
florian HENRY
b5fc559889 travis 2017-10-18 14:48:58 +02:00
florian HENRY
4273e507c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 
dev_accountancy

Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
	htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2017-10-18 09:52:56 +02:00
Laurent Destailleur
ebe0664aff Merge branch 'develop' into scrutinizer-patch-3 2017-10-16 20:54:15 +02:00
Laurent Destailleur
87814af7b6 Move function colorIsLight into functions.lib.php 
Fix scrutinizer bugs.
 2017-10-16 09:29:10 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Laurent Destailleur
d12019d1b5 Fix from scrutinizer 2017-10-13 13:10:36 +02:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/document.php
 2017-10-04 13:32:53 +02:00
florian HENRY
18bd2c4445 fix travis 2017-10-02 09:04:22 +02:00
Alexandre SPANGARO
6a05645295 Fix : Accountancy export model for Agiris Isacompta 2017-09-30 06:58:31 +02:00
florian HENRY
6fcfe89565 NEW : lettrage in accountancy 2017-09-26 13:02:29 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
2cdea7e37c Fix bug reported by scrutinizer 2017-09-12 19:21:26 +02:00
Laurent Destailleur
59721bf8ed Fix code comment 2017-09-08 13:33:52 +02:00
Laurent Destailleur
48c526f87d Debug report for accounting module 2017-09-05 12:53:25 +02:00
Laurent Destailleur
c1d31c34cd Work on reports per date 2017-09-05 02:26:23 +02:00
Laurent Destailleur
e1fa37f7ff Work on reports per date 2017-09-05 02:13:02 +02:00
Laurent Destailleur
c15454e62b Fix method to delete a bookkeeping record 2017-09-04 13:09:26 +02:00
Laurent Destailleur
31a74d448c Work on accounting reports. 2017-08-31 22:38:30 +02:00
Laurent Destailleur
ec27eb5b1e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/societe/list.php
 2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Laurent Destailleur
c5267154b9 Merge branch 'develop' into Bookkeeping-V6 2017-07-25 20:54:37 +02:00
florian HENRY
d6d454edc8 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-25 13:32:27 +02:00
Laurent Destailleur
149e1f9c67 Merge pull request #7195 from atm-florian/6.0 
fix : Various misspelling class (eclipse Oxygen standard PHP control)
 2017-07-25 13:31:40 +02:00
florian HENRY
b9d5f4ba10 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-24 09:02:32 +02:00
Laurent Destailleur
75ec7a309c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-15 21:25:14 +02:00
Laurent Destailleur
bab963ec07 FIX Pagination on the ledger page. 2017-07-15 19:19:12 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
Laurent Destailleur
201db3b720 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/tasks/task.php
 2017-07-14 00:24:49 +02:00
Laurent Destailleur
a562e5a919 Maxi debug of accountancy ledger page. 2017-07-08 20:52:53 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
4f75b6d656 Fix phpcs 2017-07-08 14:58:19 +02:00
Laurent Destailleur
4bae65bedc Fix travis 2017-07-07 22:04:29 +02:00
Laurent Destailleur
be493b78ba Merge pull request #7093 from Darkjeff/Fix-Accoutancy 
Fix accoutancy
 2017-07-07 19:14:35 +02:00
florian HENRY
7f869b4840 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
 2017-07-03 14:36:50 +02:00
Darkjeff
30153f8c2e add in bookkeeping date lim reglement 
Date lim reglement for export Sage and Iris
correct avoir when write in bookkeeping
 2017-07-03 07:21:15 +02:00
Laurent Destailleur
c5aed0c333 Fix phpcs 2017-07-01 14:25:46 +02:00
Laurent Destailleur
31fe8ebcee Debug v6 2017-07-01 02:22:08 +02:00
Darkjeff
180467ba56 add lettering 2017-06-30 11:53:15 +02:00
florian HENRY
7556a604e3 fix travis 2017-06-29 16:30:57 +02:00