Gustavo Novaro
|
febe95cd2e
|
$db attributte now be protected
|
2017-02-08 20:27:14 -03:00 |
|
Gustavo Novaro
|
e053308c6f
|
Code style
var to public
|
2017-02-08 17:24:11 -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 |
|
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
|
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 |
|
Laurent Destailleur
|
88e2ee8492
|
Merge pull request #6401 from IonAgorria/syslog-delay
NEW: Show delay in syslog
|
2017-02-08 19:21:10 +01:00 |
|
De Coninck Laurent
|
439bda053d
|
fix correct url for expense report note in expense report list
|
2017-02-08 19:18:16 +01:00 |
|
De Coninck Laurent
|
a042c30b28
|
fix nex line
|
2017-02-08 19:00:48 +01:00 |
|
Ion
|
22b85b3aba
|
Show delay in syslog
|
2017-02-08 17:30:51 +01:00 |
|
Laurent Destailleur
|
596c092ec8
|
Merge pull request #6219 from atm-florian/dev_changelistchild
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
|
2017-02-08 16:49:18 +01:00 |
|
Laurent Destailleur
|
f4e64685e8
|
Merge pull request #6397 from apachler/develop
added additional payment terms often needed in Austria
|
2017-02-08 16:47:40 +01:00 |
|
Laurent Destailleur
|
072fa9987b
|
Update 4.0.0-5.0.0.sql
|
2017-02-08 16:47:27 +01:00 |
|
Andreas Pachler
|
c45b40075d
|
fixed typos
|
2017-02-08 12:55:03 +01:00 |
|
Laurent Destailleur
|
d5b10a18b7
|
Debug module variant
|
2017-02-08 12:52:31 +01:00 |
|
Andreas Pachler
|
ae3ace7e94
|
added additional payment terms often needed in Austria
|
2017-02-08 12:46:42 +01:00 |
|
Laurent Destailleur
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +01:00 |
|
Laurent Destailleur
|
b24f244f67
|
Merge pull request #5533 from marcosgdf/prod-attr
Feature Request: NEW Added product attributes feature
|
2017-02-08 11:20:33 +01:00 |
|
Laurent Destailleur
|
b611c5ca53
|
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
|
2017-02-08 11:16:10 +01:00 |
|
Laurent Destailleur
|
b250485efd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-08 11:00:19 +01:00 |
|
Laurent Destailleur
|
31c3398b7f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/modules.php
|
2017-02-08 10:59:05 +01:00 |
|
Laurent Destailleur
|
dc0856413c
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-02-08 10:57:02 +01:00 |
|
Paris Liakos
|
eb452397bd
|
Wrong trigger when setting supplier invoice back to draft
|
2017-02-08 10:56:28 +01:00 |
|
Laurent Destailleur
|
775cd8ca7d
|
Merge pull request #6391 from ParisLiakos/develop
Wrong trigger when setting supplier invoice back to draft
|
2017-02-08 10:55:42 +01:00 |
|
Laurent Destailleur
|
4c3255857c
|
Fix bad syntax into criteria to filter on date in export.
Fix missing type in export of invoices.
|
2017-02-08 10:45:20 +01:00 |
|
Laurent Destailleur
|
c4b95e6509
|
Merge pull request #6395 from atm-florian/develop
Fix travis for php 7
|
2017-02-08 09:58:54 +01:00 |
|
De Coninck Laurent
|
49e6192e62
|
fix the type width column and the nextY
|
2017-02-08 09:23:15 +01:00 |
|
florian HENRY
|
7fcf598c78
|
Fix travis
|
2017-02-08 08:52:58 +01:00 |
|
Alexandre SPANGARO
|
4126dcff03
|
[FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed.
|
2017-02-08 06:51:42 +01:00 |
|
Alexandre SPANGARO
|
e4fc52497e
|
New : [FP17] Accountancy - Add export of charts of accounts
|
2017-02-08 06:18:56 +01:00 |
|
Laurent Destailleur
|
0a797cd12e
|
Fix us terms.
|
2017-02-07 20:08:15 +01:00 |
|
Laurent Destailleur
|
8e733ca2fe
|
Remove menu entry that is not reserved to admin users frmo admin area.
|
2017-02-07 19:58:49 +01:00 |
|
Paris Liakos
|
9a141f8556
|
Wrong trigger when setting supplier invoice back to draft
|
2017-02-07 20:55:40 +02:00 |
|
Laurent Destailleur
|
fbff32823a
|
Fix translation
|
2017-02-07 12:43:12 +01:00 |
|
Laurent Destailleur
|
c6e0a4cc87
|
Fix column label
|
2017-02-07 12:39:45 +01:00 |
|
Laurent Destailleur
|
df6983b3c5
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-02-07 02:13:54 +01:00 |
|
Laurent Destailleur
|
d56b5f30c8
|
FIX #6330
|
2017-02-07 01:34:21 +01:00 |
|
Laurent Destailleur
|
b0ee04c079
|
FIX #6379
|
2017-02-07 01:13:50 +01:00 |
|
Laurent Destailleur
|
e58743ea5b
|
Fix regression: Textarea to enter data was crushed.
|
2017-02-07 01:13:04 +01:00 |
|
Laurent Destailleur
|
2d77cb2da5
|
FIX #6379
|
2017-02-07 00:54:54 +01:00 |
|
Laurent Destailleur
|
afa68a1418
|
Fix label for late
|
2017-02-07 00:45:14 +01:00 |
|
Laurent Destailleur
|
6b528b2bea
|
Fix translation: Open -> opened (open is for "mind/spirit", opened is
the adjective for a status)
|
2017-02-06 21:34:05 +01:00 |
|
Laurent Destailleur
|
aa573b6dba
|
git push origin developMerge branch 'atm-geoffrey-new_link_weather_board' into develop
|
2017-02-06 20:52:09 +01:00 |
|
Laurent Destailleur
|
ce067f9130
|
Merge branch 'new_link_weather_board' of
https://github.com/atm-geoffrey/dolibarr into
atm-geoffrey-new_link_weather_board
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/index.php
|
2017-02-06 20:51:46 +01:00 |
|
Laurent Destailleur
|
fcbc12ce31
|
Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project
New link movement stock to project
|
2017-02-06 20:45:04 +01:00 |
|
Laurent Destailleur
|
aa1c14e508
|
Remove change of PMP when we should not
|
2017-02-06 20:43:44 +01:00 |
|
Laurent Destailleur
|
b3e6b95714
|
Merge pull request #6377 from marcosgdf/fr-2763
NEW #2763 Go to document block after clicking in Generate document button
|
2017-02-06 20:38:36 +01:00 |
|
Laurent Destailleur
|
8f52a34e71
|
Report of supplier payment is name "supplier_payments"
|
2017-02-06 20:37:42 +01:00 |
|
Laurent Destailleur
|
a4bbcd866b
|
Merge pull request #6372 from atm-arnaud/NEW_supplier_paiements_report
NEW Add supplier paiements report
|
2017-02-06 20:29:42 +01:00 |
|
Laurent Destailleur
|
b447501d72
|
Merge pull request #6371 from atm-arnaud/4.0_fix_trad_project_filter
Fix project filter traduction
|
2017-02-06 20:25:45 +01:00 |
|