Commit Graph

18 Commits

Author SHA1 Message Date
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
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
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
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Juanjo Menent
75eb61702e Fix: Showing accounting account fails 2014-10-07 12:46:05 +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
7b300b0a9d FIX: Missing variable declaration 2014-09-19 03:05:19 +02:00
Raphaël Doursenaud
bab1dd13e2 FIX: missing extends 2014-09-19 03:05:19 +02:00
aspangaro
fad9fe71bc Sort out type & subtype by Chart of accounts 2014-09-06 14:45:35 +02:00
aspangaro
102e85e1e7 Merge branch 'Upstream/develop' 2014-09-04 04:34:04 +02:00
Laurent Destailleur
1375e20fe2 Fix: doxygen 2014-09-03 09:45:29 +02:00
aspangaro
4f41ee9f4c typo 2014-09-03 07:24:30 +02:00
aspangaro
9d08f4c5f5 Patch Accounting Expert module 2014-09-03 07:22:59 +02:00
Laurent Destailleur
df70450073 Fix: Doxygen 2014-09-02 20:00:10 +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