198 Commits

Author	SHA1	Message	Date
Laurent Destailleur	dd3f5a32d3	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: .travis.yml composer.json htdocs/accountancy/admin/card.php	2015-12-18 21:20:12 +01:00
aspangaro	dfbc2814e7	Fix: Add an empty field for list of parent account - This value can be null	2015-12-15 21:10:53 +01:00
Florian HENRY	8edf3c65c6	work on accounting	2015-12-11 11:46:22 +01:00
Laurent Destailleur	12702ee128	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/report.lib.php htdocs/product/stock/class/mouvementstock.class.php	2015-12-03 12:59:13 +01:00
aspangaro	b1122b55d4	Fix : accountancy code on finance journal is not a constant	2015-11-30 21:07:27 +01:00
aspangaro	37da315af6	Remove old code	2015-11-26 06:30:09 +01:00
aspangaro	9a2259c681	Correct button 'Export' and 'Write bookkeeping' on finance journal	2015-11-26 06:19:24 +01:00
aspangaro	06f752b250	Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy	2015-11-16 06:50:04 +01:00
Laurent Destailleur	93be4305c4	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: build/makepack-dolibarr.pl htdocs/accountancy/customer/card.php htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/card.php htdocs/accountancy/supplier/list.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/fichinter/card.php htdocs/societe/rib.php	2015-11-13 12:18:46 +01:00
Laurent Destailleur	b3be7f65cd	Fix syntax error . = instead of .=	2015-11-13 11:12:49 +01:00
aspangaro	f0a3bca4c2	Fix: Accountancy compatibility with subtotal & jalon module	2015-11-08 04:22:49 +01:00
aspangaro	337643e53e	Accountancy : Correct errors of display in bank journal	2015-11-04 22:31:24 +01:00
Laurent Destailleur	7fd01d4aa3	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/paiement/cheque/class/remisecheque.class.php htdocs/product/class/html.formproduct.class.php htdocs/product/stock/index.php htdocs/product/stock/list.php htdocs/product/stock/mouvement.php htdocs/product/stock/product.php htdocs/product/stock/valo.php	2015-09-09 12:45:22 +02:00
aspangaro	a4a72d64c0	New: Accountancy Add message when general ledger is witten	2015-09-06 06:43:40 +02:00
aspangaro	b268ccf064	Fix #3455 In advanced accounting module, button transfer to general ledger don't work	2015-09-06 04:52:03 +02:00
Laurent Destailleur	ce2e5e7862	Little debug of accounting module	2015-09-03 11:54:03 +02:00
Florian HENRY	a916b75ad8	FIX : Better const usage in accountancy module	2015-08-13 11:32:31 +02:00
Florian HENRY	2775250ce4	Fix TYPE_SITUATION on sell journals	2015-08-13 11:23:27 +02:00
Florian HENRY	6806e2b36b	FIX : Accountancy expert module filter on column must not launch ventil ... ventil	2015-08-13 10:27:35 +02:00
Laurent Destailleur	418a609b73	Fix PHPCS	2015-08-13 03:06:25 +02:00
Florian HENRY	17146fdef7	fix stuff	2015-08-12 16:11:00 +02:00
Florian HENRY	adccd5d04f	fix some feature on accountancy modules	2015-08-12 15:53:17 +02:00
Florian HENRY	f2c59405d4	Merge branch 'develop' into develop_darkjeff ... Conflicts: htdocs/accountancy/admin/productaccount.php	2015-08-12 14:23:51 +02:00
Darkjeff	2500e26072	update product account ... clean sql if buy or sell	2015-08-10 10:29:05 +02:00
Darkjeff	b185cfb85f	Update product account ... choose between code sell or code buy cleaning code need some tests	2015-08-06 21:23:02 +02:00
Darkjeff	977b12fac0	clean code customer and supplier accountancy ... celan code add VAT research	2015-07-28 19:26:46 +02:00
Laurent Destailleur	cb98d6cb93	Merge remote-tracking branch 'origin/3.8' into develop	2015-07-19 15:32:20 +02:00
Laurent Destailleur	eec1f4dcdf	Merge pull request #3267 from Dolibarr/3.8 ... fix user role and uk_user_api_key if api module not enabled	2015-07-18 23:51:51 +02:00
aspangaro	b9b6abd7a8	Merge remote-tracking branch 'Upstream/3.8' into 3.8-1	2015-07-18 05:29:57 +02:00
aspangaro	7b1976040d	Error	2015-07-17 05:26:32 +02:00
aspangaro	5ce419922d	Fix: #3253 #3252 #3251 Remove print_r	2015-07-17 05:22:29 +02:00
aspangaro	59e88590e0	Move my address email to new one	2015-07-15 20:30:33 +02:00
Darkjeff	fbf9e6b4b8	Clean Customer list ... Clean code Add VAT research If red line no case check Remove comments	2015-07-14 10:06:44 +02:00
Juanjo Menent	f9757bf072	Merge pull request #3176 from aspangaro/develop-patch55 ... Fix #3166 : An accounting account can be alphanumeric (Need for EBP)	2015-07-09 09:45:59 +02:00
aspangaro	600354e057	Update formventilation with elarifr modification	2015-07-09 07:48:09 +02:00
aspangaro	9fdc2991c7	Correct	2015-07-09 07:47:31 +02:00
aspangaro	0b19f2e068	Update list.php with elarifr modification	2015-07-09 07:46:58 +02:00
aspangaro	d286c18148	Update lines.php with elarifr modification	2015-07-09 07:11:08 +02:00
aspangaro	dbb5d3d386	Fix #3166 : An accounting account can be alphanumeric (Need for EBP)	2015-07-08 21:47:45 +02:00
aspangaro	a283d0ce93	Update from elarifr	2015-07-08 07:46:26 +02:00
aspangaro	4c72567c6b	Update bookkeeping	2015-07-08 07:19:23 +02:00
aspangaro	787d2310c1	Correct language key	2015-07-07 05:57:35 +02:00
aspangaro	fc3995c0be	Accountancy: Bank journal - Show user on salary payment & user new account to pay vat	2015-07-04 16:39:52 +02:00
Laurent Destailleur	97524687c7	Merge pull request #3113 from aspangaro/develop-patch44 ... Add getNomUrl on accounting for an account	2015-07-04 03:40:30 +02:00
aspangaro	a762910f11	Add getNomUrl on accounting for account	2015-06-29 21:16:30 +02:00
aspangaro	9d2e964b00	Fix: print_liste_field_titre('');	2015-06-26 06:23:29 +02:00
Juanjo Menent	0f6aaf1461	Merge pull request #3094 from aspangaro/develop-patch41 ... Accounting - Add field to edit in admin	2015-06-25 20:42:37 +02:00
aspangaro	e20da5511d	Accounting - Add field to edit in admin	2015-06-25 06:54:19 +02:00
aspangaro	452733263d	Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT	2015-06-25 06:37:26 +02:00
aspangaro	2ab454e757	Presentation	2015-06-21 14:32:00 +02:00