Juanjo Menent
|
4751c5ac67
|
Merge pull request #4881 from hregis/3.8_fix_merge
Fix: 3.7-3.8 fix merge
|
2016-03-23 22:59:18 +01:00 |
|
Juanjo Menent
|
922c57da76
|
NEW #3510 : Standardize module
|
2016-03-23 22:45:04 +01:00 |
|
aspangaro
|
1712ad04cc
|
Debug works
|
2016-03-23 22:23:59 +01:00 |
|
aspangaro
|
252f37b363
|
NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet
|
2016-03-23 21:36:52 +01:00 |
|
Regis Houssin
|
b38e75c404
|
Merge branch '3.8_fix_merge' into 3.9_fix_merge
|
2016-03-23 14:03:35 +01:00 |
|
fmarcet
|
b8bc881e5a
|
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
|
2016-03-23 13:57:17 +01:00 |
|
fmarcet
|
84e5c8b437
|
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
|
2016-03-23 13:56:06 +01:00 |
|
fmarcet
|
e2b4d39292
|
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
|
2016-03-23 13:54:39 +01:00 |
|
fmarcet
|
52d88db5c3
|
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
|
2016-03-23 13:53:18 +01:00 |
|
Regis Houssin
|
20d785ad28
|
Merge remote-tracking branch 'origin/3.7' into 3.8_fix_merge
Conflicts:
htdocs/filefunc.inc.php
|
2016-03-23 13:40:05 +01:00 |
|
Juanjo Menent
|
a7581f8663
|
Merge pull request #4879 from aspangaro/4.0-p5
NEW: Accountancy Add a way to initialize chart of accounts
|
2016-03-23 12:55:07 +01:00 |
|
Juanjo Menent
|
1dce6a9abc
|
Merge pull request #4878 from aspangaro/4.0-p4
FIX: Accountancy Bank journal Fix some problem with other module
|
2016-03-23 12:53:34 +01:00 |
|
Juanjo Menent
|
a758d9d420
|
Merge pull request #4873 from aspangaro/4.0-p2
Add in migration file 3.9 - 4.0, a sql operation to delete old menu of expense report
|
2016-03-23 12:52:39 +01:00 |
|
aspangaro
|
923b5930ec
|
NEW: Accountancy Add a way to initialize chart of accounts
|
2016-03-23 06:05:48 +01:00 |
|
aspangaro
|
8aed039ad3
|
FIX: Accountancy Bank journal Fix some problem with other module
|
2016-03-22 22:32:02 +01:00 |
|
Laurent Destailleur
|
a2b3b24ca9
|
FIX Must not return error when vars does not exists
|
2016-03-22 22:01:07 +01:00 |
|
Laurent Destailleur
|
dd26ede0ef
|
Add code comment
|
2016-03-22 19:24:48 +01:00 |
|
Laurent Destailleur
|
54ac3c0a7b
|
Fix regression
|
2016-03-22 17:41:42 +01:00 |
|
Laurent Destailleur
|
95a45e8f87
|
Prepare code to be able to download ODT templates
|
2016-03-22 17:35:58 +01:00 |
|
Laurent Destailleur
|
ced1462b75
|
Fix regression
|
2016-03-22 16:59:54 +01:00 |
|
Alexis Algoud
|
c3bdc6372d
|
NEW allow project to be shared across entities
|
2016-03-22 16:48:51 +01:00 |
|
Laurent Destailleur
|
612aa0ab04
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-03-22 15:50:56 +01:00 |
|
Laurent Destailleur
|
f686ef1d04
|
Uniformize look
|
2016-03-22 15:50:35 +01:00 |
|
aspangaro
|
53f2a7a0ac
|
Merge remote-tracking branch 'Upstream/develop' into 4.0-p2
|
2016-03-22 12:58:40 +01:00 |
|
Laurent Destailleur
|
8189a5eadd
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-03-22 12:58:34 +01:00 |
|
aspangaro
|
72abdde912
|
Add in migration file 3.9 - 4.0, a sql operation to delete old menu of expense report
|
2016-03-22 12:57:45 +01:00 |
|
Laurent Destailleur
|
4f3f1eda7b
|
FIX Duplicate records into export
|
2016-03-22 12:55:29 +01:00 |
|
Laurent Destailleur
|
876484dfb5
|
FIX Duplicate records into export
|
2016-03-22 12:54:26 +01:00 |
|
Sebastien Bechet
|
82f74ceb38
|
Postgresql compatibility patch + cosmetic
|
2016-03-22 10:09:41 +01:00 |
|
Juanjo Menent
|
10f30cf569
|
Merge pull request #4869 from marcosgdf/misc-fix
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 22:31:46 +01:00 |
|
Marcos García
|
d15da596d8
|
Update ChangeLog
|
2016-03-21 22:24:46 +01:00 |
|
Marcos García de La Fuente
|
bfbcf7a64c
|
Unintended changes
|
2016-03-21 21:57:00 +01:00 |
|
Marcos García de La Fuente
|
d9dab762ad
|
Added changes to the changelog
|
2016-03-21 21:55:57 +01:00 |
|
Marcos García de La Fuente
|
89bd173c2f
|
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 21:51:29 +01:00 |
|
Juanjo Menent
|
fbe34e9efc
|
Merge pull request #4860 from aspangaro/4.0-p2
NEW: Move Expense report menu from module to menu files
|
2016-03-21 21:27:55 +01:00 |
|
Juanjo Menent
|
c323948669
|
Merge pull request #4856 from marcosgdf/pdf-phpdoc-fix
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
|
2016-03-21 20:40:07 +01:00 |
|
aspangaro
|
3c09e67453
|
Merge remote-tracking branch 'Upstream/develop' into 4.0-p2
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
|
2016-03-21 20:38:17 +01:00 |
|
Juanjo Menent
|
19f6f7049d
|
Merge pull request #4850 from fentman/patch-2
Update main.lang
|
2016-03-21 20:31:25 +01:00 |
|
Juanjo Menent
|
022958c8ad
|
Merge pull request #4861 from aspangaro/4.0-p3
FIX: Some typo on auguria menu
|
2016-03-21 20:27:36 +01:00 |
|
Juanjo Menent
|
187a04854f
|
Merge pull request #4862 from marcosgdf/form-selectarray2
Corrected non-static usages of several Form functions
|
2016-03-21 20:21:29 +01:00 |
|
Juanjo Menent
|
5fabb7b1e1
|
Merge pull request #4865 from aspangaro/3.9-p20
FIX: Donation || Don't show project icon if fk_project is empty
|
2016-03-21 20:12:32 +01:00 |
|
aspangaro
|
8f1cbe9ed8
|
FIX: Donation || Don't show project icon if fk_project is empty
|
2016-03-21 12:59:30 +01:00 |
|
Laurent Destailleur
|
99ceb006e4
|
FIX Bad include and param for project numbering module call
|
2016-03-21 11:47:32 +01:00 |
|
phf
|
a6fa3a4c25
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
|
2016-03-20 21:58:24 +01:00 |
|
Laurent Destailleur
|
d4f5076a84
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-03-20 17:37:50 +01:00 |
|
Laurent Destailleur
|
706a7f05b8
|
FIX PHPCS
|
2016-03-20 17:37:27 +01:00 |
|
Laurent Destailleur
|
6b821f15d1
|
FIX Bad vat definition when using POS module
|
2016-03-20 17:36:13 +01:00 |
|
phf
|
600abc9794
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
|
2016-03-20 15:56:54 +01:00 |
|
phf
|
661ee72d55
|
UPDATE move ajax request in js file and call a new php file to update all rates
|
2016-03-20 15:17:30 +01:00 |
|
Marcos García de La Fuente
|
5a046125db
|
Missing changes from previous commits
|
2016-03-20 14:24:49 +01:00 |
|