Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Laurent Destailleur
800aa4d5b6
Fix bad target
2017-07-31 04:49:54 +02:00
Alexandre SPANGARO
fb4727c408
Add a specific entry in tax menu for various payment
2017-07-28 06:27:04 +02:00
Laurent Destailleur
9e6666e511
Fix translation keys for taxes
2017-07-22 16:40:19 +02:00
Laurent Destailleur
1735a649e9
Fix permission on salary module
2017-07-15 13:02:41 +02:00
Laurent Destailleur
0763d15b4c
Debug journalization
...
Debug edition of user BAN.
2017-07-15 12:37:31 +02:00
Alexandre SPANGARO
0c5febfb4d
Fix: Accountancy
2017-07-07 06:09:49 +02:00
Laurent Destailleur
b7218c1bcd
Fix menu consistency
2017-07-01 03:18:17 +02:00
Laurent Destailleur
31fe8ebcee
Debug v6
2017-07-01 02:22:08 +02:00
Laurent Destailleur
92287ab18d
Fix url suggested for bookmark did not always include params
2017-06-27 11:12:03 +02:00
Laurent Destailleur
267170b8d2
Fix mainmenu was not correctly set with auguria menu
2017-06-27 10:34:41 +02:00
Laurent Destailleur
3fdfebf7ef
Fix position of top menu does not follow 'position' field.
2017-06-27 04:25:41 +02:00
Laurent Destailleur
3b2eb97d72
Fix menu position
2017-06-24 10:29:07 +02:00
Laurent Destailleur
59bd4749a8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/class/product.class.php
2017-06-24 10:27:10 +02:00
Laurent Destailleur
ee8924e101
Fix position of accounting periods
2017-06-24 10:23:38 +02:00
Alexandre SPANGARO
e9b6afd2aa
Add last session coding - Add temporaly ledger
2017-06-18 22:17:32 +02:00
Laurent Destailleur
1b56e4a01c
Fix look and feel v6
2017-06-14 11:28:42 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
70c7bcc85f
Complete css to get value unique
2017-06-13 15:57:30 +02:00
Laurent Destailleur
225c17d047
Fix permission on menu entry
2017-06-13 11:06:57 +02:00
Laurent Destailleur
ffdee40eb9
Fix permission on recurring invoice list
2017-06-13 10:58:41 +02:00
Laurent Destailleur
890ac81e4d
Fix menu entried must be greyed, sub menus not visible fi not allowed on
...
parent.
2017-06-10 19:16:42 +02:00
Laurent Destailleur
20f1bb76cb
Fix memu under disabled entries, when using smartphone
2017-06-10 16:13:37 +02:00
Regis Houssin
7ed0643b52
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 10:54:16 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Alexandre SPANGARO
806d25ae41
Activate multi-journal on expensereport journal
2017-06-05 06:44:53 +02:00
Alexandre SPANGARO
ef9275d031
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
...
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
2017-06-03 07:48:50 +02:00
Alexandre SPANGARO
90c1a38486
Accountancy - Activate multijournal on bank_journal
2017-06-03 07:23:14 +02:00
Laurent Destailleur
1761df2bc2
NEW Add page statistics for project tasks
2017-06-02 19:28:22 +02:00
Laurent Destailleur
6f723490c2
Fix syntax error
2017-05-29 12:58:23 +02:00
BENKE Charlie
4c382f94e1
Changes done
2017-05-29 10:39:02 +02:00
BENKE Charlie
b0bac770e5
menu descriptor must be only present in main
...
If we add the same menu descriptor
the additionnal menu are added on the second, not the main
I propose to suppress it OR change "customers_bills" as "customers_bills_list" who allow to add some menu as sub-menu
2017-05-25 08:07:11 +02:00
Laurent Destailleur
ff2a268831
NEW Architecture to manage search criteria persistance (using
...
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
2017-05-19 00:52:13 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Laurent Destailleur
fc5f4007a1
Debug accountancy module. Page for bank journalization is still KO.
2017-05-05 16:54:05 +02:00
Alexandre SPANGARO
6afd0d642a
Finish to move accountancy journals list to page like dictionnary
2017-05-01 08:16:09 +02:00
Alexandre SPANGARO
fed1b152d9
Correct multi-journals
2017-04-30 07:41:47 +02:00
Laurent Destailleur
60951cf307
Less data example
2017-04-30 04:09:50 +02:00
Laurent Destailleur
4993a43025
Move new feature inventory into module stock.
2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e
Move new feature inventory into module stock.
2017-04-29 21:53:01 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
florian HENRY
2496286374
fix :missing mainmenu and leftmenu into accoutancy menu descriptor
2017-04-14 12:27:53 +02:00
Laurent Destailleur
bb7c164752
Work on page to set/edit default values
2017-04-08 14:18:10 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:56:48 +02:00
Laurent Destailleur
fe4f71296f
FIX #6636 Complete fix
2017-04-06 21:55:23 +02:00
Laurent Destailleur
9df4bac202
NEW Bookmarks are into a combo list.
2017-04-04 11:56:19 +02:00
BENKE Charlie
5b5380659e
ERROR Categories Bank vs categories transactions
...
PB since 4.0, present in 5.0 and develop version
There is a confusion between the categorization function of bank accounts and the categorization function of the records. The categorization of the entries has been removed or it is not replaced by the categorization of the bank accounts.
I propose for the moment to restore the old category of writings but to envisage the creation of a new type of category "bank records" (or if it is not necessary with the new account) to leave so
2017-04-03 15:58:48 +02:00
