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
49,784 Commits 36 Branches 190 Tags
039039bb0078007af2495f1655956afb51a4ac05
Commit Graph

61 Commits

Author SHA1 Message Date
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
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
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +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
aspangaro
452733263d Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT 2015-06-25 06:37:26 +02:00
aspangaro
d959c552f2 Fix: Accountancy - SQL error 2015-06-19 06:01:42 +02:00
aspangaro
47045e0746 Accountancy: Review presentation 2015-05-28 21:34:35 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
BENKE Charles
e7ed8ce95b Update purchasesjournal.php 2015-03-11 10:23:33 +01:00
BENKE Charles
9fc83ca011 Update sellsjournal.php 2015-03-11 10:23:13 +01:00
BENKE Charles
f91127c92a Update purchasesjournal.php 2015-03-10 21:48:47 +01:00
BENKE Charles
bf86693dcb Update sellsjournal.php 2015-03-10 21:47:39 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
aspangaro
4ba095cb5c FIXED: Bankjournal is generated from id_account now 2015-02-22 15:04:18 +01:00
aspangaro
cda6e7adf9 Delete cash journal 2015-02-22 14:20:42 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
0d150b1d32 Removed unused code, misc corrections and corrected PHPDoc problems. 2015-02-10 10:25:59 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
aspangaro
14a078c9a7 FIXED Accountancy clean code 2015-02-03 06:39:44 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
aspangaro
94a9d0159d Align module with 3.7 & contrary 2015-01-25 15:24:16 +01:00
Laurent Destailleur
1664b89cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 19:26:19 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Laurent Destailleur
8d4fc263c5 Fix: Var not defined 2014-11-16 18:37:09 +01:00
aspangaro
4951feeb8f Correct rights & presentation 2014-11-01 07:59:52 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
cb302c16e7 Bad place of code 2014-09-29 16:22:00 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
Laurent Destailleur
ad8b92541d Fix: sql request with pgsql 
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
 2014-09-20 00:57:29 +02:00
Raphaël Doursenaud
e87b1d68b6 FIX: Replaced deprecated property 2014-09-19 03:07:53 +02:00
Raphaël Doursenaud
eea9a76589 FIX: Variable might not be traversable 2014-09-19 03:07:52 +02:00
Raphaël Doursenaud
cc68966d72 FIX: Missing declaration 2014-09-19 03:05:20 +02:00
Raphaël Doursenaud
9a141215bb FIX: Moved code to where the variable is defined 2014-09-19 03:05:20 +02:00
aspangaro
d4bcea0799 Correct bank journal 2014-09-15 20:30:03 +02:00
aspangaro
7cc3fe9c95 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-09 20:41:19 +02:00
Laurent Destailleur
9e2a0cb671 Fix: debug of accountancy module 2014-09-09 09:46:57 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00