Laurent Destailleur
|
b985dc3342
|
Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into
aspangaro-develop-accounting
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/install/mysql/tables/llx_bank_account.sql
|
2014-06-30 00:42:17 +02:00 |
|
Laurent Destailleur
|
6cf8c3d08c
|
Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
|
2014-06-29 23:57:57 +02:00 |
|
Laurent Destailleur
|
e2472351c3
|
Merge branch 'fix1487' of github.com:KreizIT/dolibarr into
KreizIT-fix1487
Conflicts:
ChangeLog
|
2014-06-29 23:42:38 +02:00 |
|
aspangaro
|
5cc8ec4f5f
|
Add accountancy code journal into bank card & modify presentation
|
2014-06-29 20:10:43 +02:00 |
|
aspangaro
|
53bd5022e0
|
Align size for accounting account & Drop old table & Typo
|
2014-06-29 07:57:42 +02:00 |
|
Laurent Destailleur
|
1dafb58f09
|
Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into
aspangaro-develop-accounting3
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
|
2014-06-26 22:53:25 +02:00 |
|
Laurent Destailleur
|
e2790895ad
|
Prepare 3.7 development.
|
2014-06-26 21:48:57 +02:00 |
|
aspangaro
|
865d853af8
|
Add migration file to 3.7 & update llx_c_paiement
|
2014-06-24 06:02:17 +02:00 |
|