Laurent Destailleur
cda301f6b7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-12 20:51:52 +01:00
Laurent Destailleur
d4fd9bd71e
Merge pull request #6414 from laudeco/fix/dictionnary_without_rowid
...
[FIX] Dictionaries without rowid
2017-02-12 20:46:43 +01:00
Laurent Destailleur
1dca3471db
Merge pull request #6409 from IonAgorria/supplierorder-oldline
...
FIX: Fill oldline in supplier order updateline
2017-02-12 20:45:20 +01:00
Laurent Destailleur
b11f71386d
Merge pull request #6412 from laudeco/feature/fix_card_page_generator
...
fix the card page generator
2017-02-12 20:43:30 +01:00
Laurent Destailleur
658330b971
Merge pull request #6408 from gnovaro/patch-6
...
Code style
2017-02-12 20:41:55 +01:00
Laurent Destailleur
38ab06984f
Merge pull request #6407 from gnovaro/patch-5
...
Code style
2017-02-12 20:41:15 +01:00
Laurent Destailleur
953f737134
Merge pull request #6406 from gnovaro/patch-4
...
Code style
2017-02-12 20:40:44 +01:00
Laurent Destailleur
a8c5ba2983
Fix php7 error
2017-02-12 20:40:20 +01:00
Laurent Destailleur
2801c6e009
Merge pull request #6405 from gnovaro/patch-3
...
Move php values to js call
2017-02-12 20:36:04 +01:00
Laurent Destailleur
5233b8c87f
Fix support for option MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES
2017-02-12 18:38:24 +01:00
Laurent Destailleur
05c9f57fd4
Move edition of emails templates out of dictionaries so we would be able
...
to have templates per user (not reserved to admin).
2017-02-12 18:13:49 +01:00
Laurent Destailleur
f34e0b1bdb
NEW Can deploy an external module from the module setup area.
2017-02-11 15:41:01 +01:00
Laurent Destailleur
3fa19f84e3
FIX the dolCopyDir fails if target dir does not exists.
2017-02-11 15:40:25 +01:00
Laurent Destailleur
4723eac227
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-11 13:56:39 +01:00
Laurent Destailleur
f5569ee890
Add tasktime_task_duration_sec tag in odt substitution
2017-02-11 13:50:30 +01:00
Laurent Destailleur
b9db7eba1b
Fix: deployement of a module
2017-02-10 19:14:58 +01:00
Laurent Destailleur
f6a8aacc8d
Fix: deployement of a module
2017-02-10 18:42:59 +01:00
Laurent Destailleur
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
Laurent Destailleur
ca67917e80
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
Laurent Destailleur
a4f2325902
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-10 17:28:49 +01:00
Laurent Destailleur
a4d9f7dbbe
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-10 17:27:47 +01:00
Laurent Destailleur
d463511cff
Fix: no way to know type of invoice.
2017-02-10 17:24:47 +01:00
Laurent Destailleur
97eebe164c
Better translation
2017-02-10 17:09:56 +01:00
Laurent Destailleur
44ab6ad9b7
NEW Can control constants values into file integrity checker
2017-02-10 17:05:45 +01:00
Laurent Destailleur
d461c0dfa4
Fix left align
2017-02-10 10:47:19 +01:00
Laurent Destailleur
66542b6367
Fix translation and link to direct debit payment
2017-02-10 10:43:54 +01:00
De Coninck Laurent
4fb4bc6f6c
[FIX] Dictionnaries without rowid
...
It's possible to create a dictionnary without the key rowid.
But in that case it's impossible to enable/disable the value because the dictionnary fonctionality uses always rowid even another primary key is defined.
By this fix, the id property uses is the primary key defined on the dictionnary creation.
2017-02-10 10:29:08 +01:00
Laurent Destailleur
2184eabe2f
Fix english
2017-02-09 22:02:37 +01:00
Laurent Destailleur
ad308e33cc
Fix scrutinizer warning
2017-02-09 18:29:04 +01:00
Laurent Destailleur
7dddba3e39
Add octicons
2017-02-09 14:42:15 +01:00
De Coninck Laurent
fa527ff4eb
fix the card page generator
2017-02-09 13:10:32 +01:00
Laurent Destailleur
488d68113d
Add total in the file integrity checker
2017-02-09 12:56:39 +01:00
Laurent Destailleur
6f3f0a826f
Fix pad files
2017-02-09 11:24:01 +01:00
Laurent Destailleur
56d7fe1bf6
Pad files with https
2017-02-09 10:23:44 +01:00
Laurent Destailleur
767e842c68
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-09 01:08:17 +01:00
Laurent Destailleur
fbe0b13706
Add parameter to set the url to use for the file integrity checker
2017-02-09 01:07:54 +01:00
Gustavo Novaro
febe95cd2e
$db attributte now be protected
2017-02-08 20:27:14 -03:00
Gustavo Novaro
f8a6d60fe5
$db attibute now be protected.
2017-02-08 20:24:20 -03:00
Ion
2418754d71
Fill oldline in supplier order updateline
2017-02-08 23:27:58 +01:00
Gustavo Novaro
a8c5661cb7
Code style
...
Set public and private
2017-02-08 17:36:04 -03:00
Gustavo Novaro
e053308c6f
Code style
...
var to public
2017-02-08 17:24:11 -03:00
Gustavo Novaro
5a7c20e897
Code style
...
var to public
2017-02-08 17:13:54 -03:00
Gustavo Novaro
8d00297509
Move php values to js call
...
Not inside js declaration
2017-02-08 16:11:31 -03:00
Laurent Destailleur
5d94c8ddac
Merge pull request #6403 from laudeco/feature/expense_report_wrong_placement
...
[FIX] - Expense report on multiple page
2017-02-08 19:34:16 +01:00
De Coninck Laurent
04d73668cc
fix correct url for expense report note in expense report list
2017-02-08 19:28:01 +01:00
Laurent Destailleur
366df59658
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-08 19:25:41 +01:00
Laurent Destailleur
8ba544fba5
Merge pull request #6402 from laudeco/bugfix/er_fix_access_to_note
...
[FIX] Expense report, fix access to notes from list
2017-02-08 19:25:27 +01:00
Laurent Destailleur
ad361d6d45
Merge pull request #6394 from aspangaro/6.0-fiscalyear
...
[FP17] Accountancy - Prepare fiscal year
2017-02-08 19:25:02 +01:00
Laurent Destailleur
e74927a54c
Merge pull request #6400 from atm-florian/4.0
...
FIX #6234
2017-02-08 19:22:46 +01:00
Laurent Destailleur
4d16540207
Merge pull request #6393 from aspangaro/6.0-export
...
NEW : [FP17] Accountancy - Add export of charts of accounts
2017-02-08 19:22:26 +01:00
