Commit Graph

278 Commits

Author SHA1 Message Date
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
aspangaro
de63388d33 Directory of file 2014-09-03 22:09:01 +02:00
aspangaro
e4f51d8f7a Merge branch 'Upstream/develop' 2014-09-02 20:47:27 +02:00
Laurent Destailleur
df70450073 Fix: Doxygen 2014-09-02 20:00:10 +02:00
aspangaro
cb189ed83e Add salary payment 2014-09-02 05:10:25 +02:00
aspangaro
def53d92bd Correct error menu 2014-08-31 14:10:48 +02:00
aspangaro
f9076162b6 Add dynamic link into accountancy menu to bank journal 2014-08-31 08:56:22 +02:00
aspangaro
0721974c05 Correct travis & licence 2014-08-31 07:41:55 +02:00
aspangaro
d6b2cb0b31 Correct travis 2014-08-30 06:05:02 +02:00
aspangaro
add4528e6c Update perms 2014-08-28 06:48:22 +02:00
aspangaro
d03763f6c3 Update Accounting Expert integration 2014-08-28 06:30:01 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00