lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

1155 Commits

Author SHA1 Message Date
Laurent Destailleur
976516a796 Fix look and feel v8 2018-11-08 09:51:46 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
5d249d71ca Fix menu at wrong place 2018-10-26 14:38:26 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
eaab953ba2 Renamed mouvement.php into movement_list.php to follow dev rules 2018-10-24 03:50:18 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
Laurent Destailleur
dfe9c05d2f Merge menu entry for tags/categories as submenu of element. 2018-10-09 15:26:15 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
387d9d685a Update auguria menu 2018-10-09 14:52:53 +02:00
Laurent Destailleur
dd0cbabc91 Fix translation 2018-10-09 14:44:13 +02:00
Laurent Destailleur
9bea9edfd7 FIX Menu to show/edit Users categories was missing 2018-10-09 14:41:21 +02:00
Laurent Destailleur
6fcb45cf40 Rename page various_payment/index.php into list.php (coding rule) 2018-10-04 19:10:39 +02:00
Laurent Destailleur
5b350a0322 Use short label 2018-10-04 19:07:38 +02:00
Laurent Destailleur
ebba33635b Close #9674 by keeping old code present (this help for transition tests) 2018-10-04 18:20:57 +02:00
atm-quentin
41d8cb87a3 debut reception setup page 2018-10-03 12:22:41 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
4151ca49eb Fix position of menu 2018-09-16 12:15:33 +02:00
Philippe GRAND
33d9e24bd6 Standardize and update code 2018-09-14 11:58:49 +02:00
Philippe GRAND
69bf43f851 Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018 2018-09-12 14:48:50 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Philippe GRAND
05772f5327 Standardize and update code 2018-09-11 17:30:43 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Laurent Destailleur
d92096f74a Fix menu payment not required if only module bank on 2018-08-13 02:04:38 +02:00
Laurent Destailleur
5583600066 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 17:37:50 +02:00
Laurent Destailleur
50df452b9e Fix status "Supplier" not always visible. 2018-07-03 17:37:23 +02:00
Laurent Destailleur
3112244529
Merge pull request #8884 from defrance/patch-117 
New : fichinter models (like factureRec)
 2018-06-30 01:19:03 +02:00
Laurent Destailleur
969b272576 Rename menu entries and report title for better understanding 2018-06-26 11:18:31 +02:00
Laurent Destailleur
3fa5649040 Fix bad test (dev journal visible when dev option on) 2018-06-23 15:22:39 +02:00
Laurent Destailleur
4dcc74d08f Fix the "back to list" link also restore the contextpage 2018-06-23 11:55:04 +02:00
Laurent Destailleur
f2ac5dab4a Fix contextpage of some menu entries 2018-06-23 10:28:06 +02:00
Laurent Destailleur
b364412a4a FIX Menu scheduled jobs not visible on jmobile conf 2018-06-19 13:10:13 +02:00
BENKE Charlene
0e7c82af95
Update eldy.lib.php 2018-05-28 16:43:23 +02:00
Laurent Destailleur
02803f9284
Merge pull request #8821 from aspangaro/8.0-b26 
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
 2018-05-25 10:36:46 +02:00
Alexandre SPANGARO
46a251a2b3 FIX : Replace feature level 2 by a constant on accountancy journal 2018-05-24 21:13:48 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Alexandre SPANGARO
1af4a857be Remove old code 2018-05-19 08:06:24 +02:00
Laurent Destailleur
e503aeb2e5
Merge pull request #8787 from aspangaro/8.0-a24 
Update module assets
 2018-05-18 09:05:46 +02:00
Laurent Destailleur
3e27d7dd2a Report of turnover by vat rate / product type / country 2018-05-15 17:51:19 +02:00
Alexandre SPANGARO
9c6f92986e Upgrade works 2018-05-11 21:48:22 +02:00
Ferran Marcet
d1fd39936c Fix: Bug on invoice status list on left menu 2018-05-08 09:04:04 +02:00
Abbes Bahfir
de8bd3f886 New : Translate accountancy journal menu entries 2018-05-07 08:43:41 +01:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
Laurent Destailleur
f6ca1eb624 Fix permission name 2018-05-05 13:24:46 +02:00
Laurent Destailleur
f50a6149d5 Look and feel v8 (menu statistics at end) 2018-05-01 11:09:03 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
257dc1cf77 Work on rewriting VAT reports 2018-04-27 19:17:34 +02:00
Laurent Destailleur
6aa2ca7462
Merge pull request #8659 from aspangaro/8.0-a24 
Fix Accountancy
 2018-04-22 20:30:42 +02:00
Laurent Destailleur
769a1f507b Debug asset module 2018-04-22 11:26:59 +02:00
Alexandre SPANGARO
d8e7c98a8d Add nature "inventory" & hide in ventilation journal 2018-04-22 05:56:31 +02:00
Laurent Destailleur
049b9b2a5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-06 14:19:25 +02:00
Laurent Destailleur
d3adbdfbbc FIX Restaure way to have empty entry menu 2018-04-06 14:04:52 +02:00
Laurent Destailleur
a886fadc2d
Merge pull request #8493 from aspangaro/8.0-a13 
NEW Module Assets
 2018-04-06 12:41:56 +02:00
Laurent Destailleur
2524a699eb Standardize file name of lists 2018-04-06 00:36:52 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +02:00
Alexandre SPANGARO
619805c7a5 Update works 2018-04-05 20:40:41 +02:00
Laurent Destailleur
6c409b2670 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 18:08:19 +02:00
Alexandre SPANGARO
3779b6ff1c Update work on assets type 2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
3799713c04 Update works 2018-04-02 06:27:55 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Regis Houssin
20e80a58a8 Fix: limit access to internal users 2018-04-01 11:43:39 +02:00
Laurent Destailleur
224fa1c03e Fix external links ko when substitution key are inside domain 2018-03-24 12:48:33 +01:00
Laurent Destailleur
ab9edef3c7 Fix external links ko when substitution key are inside domain 2018-03-24 12:46:52 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
76cceb59a9 Nead perm to read all for monthly report of leave requests 2018-03-20 13:54:52 +01:00
Laurent Destailleur
67483eeb64 NEW Report a list of leave requests for a month 2018-03-20 13:42:29 +01:00
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
d804764134 Standardize look and feel 2018-03-15 10:41:43 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Laurent Destailleur
75b470b580
Update eldy.lib.php 2018-03-10 12:43:01 +01:00
Laurent Destailleur
04bcc4dd46
Update eldy.lib.php 2018-03-10 12:39:39 +01:00
florian HENRY
1c966d4769 on going 2018-03-09 12:57:58 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned) 
NEW Online payment now record the payment on invoices
 2018-03-04 19:39:46 +01:00
Laurent Destailleur
2fc97e5c8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 14:01:34 +01:00
Laurent Destailleur
734bd4d2fb Fix menu visible in dev only 2018-02-12 10:15:58 +01:00
Laurent Destailleur
eb8664e649 NEW Can export leave requests 2018-02-09 16:08:28 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
b95cd2f383 Fix translation 2018-02-06 19:33:31 +01:00
Laurent Destailleur
69196dc52c Fix menu not visible with auguria module 2018-02-06 18:22:04 +01:00
Laurent Destailleur
22b95b1c43 Simpler top menu code 2018-02-05 23:06:48 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Laurent Destailleur
10e7517596 Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:29:19 +01:00
Laurent Destailleur
c02d46fb0a Fix leftmenu in menu entries 2018-02-05 01:33:44 +01:00
Laurent Destailleur
7a1a2cf90d Fix send into ledger for bank line record. Show accounted status. 2018-01-22 04:13:29 +01:00
Laurent Destailleur
49f59e0d06 Fix menu visible in experimental mode 2018-01-10 11:02:11 +01:00
Laurent Destailleur
e640831653
Merge pull request #7553 from atm-maxime/new_menu_expense_holidays 
Add detailed menus in HRM module
 2017-12-10 21:15:51 +01:00
Laurent Destailleur
e3dcff7f5b Fix substition for menus title and urls 2017-12-09 15:35:01 +01:00
Maxime Kohlhaas
6b278a6740 Add icons on home page menu 2017-12-07 16:01:52 +01:00
Maxime Kohlhaas
3fb8ec5067 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_menu_expense_holidays 2017-12-06 23:52:02 +01:00
Laurent Destailleur
46b281f703 Fix for #7697 2017-12-01 19:29:29 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
501f5b8292 Merge duplicate translation key 2017-11-14 18:26:39 +01:00
Laurent Destailleur
a50589c3c9 NEW Better behaviour when using a text browser 2017-11-14 15:10:46 +01:00
Laurent Destailleur
a98452ae36 Move translation 2017-11-01 10:52:42 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Laurent Destailleur
9dc4933ba0 Debug 2017-10-24 15:32:01 +02:00
Laurent Destailleur
5fd6a27c62 Fix position of top menu 2017-10-12 02:16:54 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Maxime Kohlhaas
a88bcb5299 Add detailed menus in HRM module 2017-10-03 13:49:30 +02:00
Laurent Destailleur
839f3ca41d NEW Can use an url like $conf->global>-MYPARAM for menu urls 2017-09-23 03:22:48 +02:00
Laurent Destailleur
bd45ea5a03 Split page for invoice template into card + list. Add more filters. 2017-09-22 11:28:53 +02:00
Laurent Destailleur
ffe2ee8232 Standardize code 2017-09-19 19:00:28 +02:00
Laurent Destailleur
85d59b32b3 Add timespent entry into HR top menu too 
Faster update of total of timespent
 2017-09-18 13:15:24 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4 
Accountancy - Finish moving admin to specific menu & some cleaning
 2017-09-18 11:16:36 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-09-16 12:22:18 +02:00
Laurent Destailleur
058b690e25 FIX menu enty when url is external link 2017-09-16 09:22:52 +02:00
Alexandre SPANGARO
c2e1e2491d Accountancy - Finish moving admin to specific menu & some cleaning 2017-09-16 06:53:29 +02:00
Regis Houssin
3ca90df524 Fix: translation 2017-09-15 18:21:50 +02:00
Laurent Destailleur
77056d9adb NEW All setup of accountancy can be done from menu "Accountancy-Setup" 2017-09-15 14:09:42 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
6e3174e71a Fix menu to member cards generation page was lost. 2017-09-12 17:36:19 +02:00
Laurent Destailleur
3001ee5fe7 Fix title of reports 2017-09-12 13:05:34 +02:00
Laurent Destailleur
b645aeb954 Fix lang loading 2017-09-09 09:41:07 +02:00
Laurent Destailleur
b7197530c2 NEW Each user can edit its own email template (menu tools) 2017-09-08 12:48:01 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Laurent Destailleur
31a74d448c Work on accounting reports. 2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64 Uniformize code of accounting report 2017-08-31 15:44:36 +02:00
Laurent Destailleur
0a67ca53d4 Fix menu auguria 2017-08-30 17:14:54 +02:00
Laurent Destailleur
22ca29a51f Fix sql syntax error 2017-08-29 13:32:25 +02:00
Laurent Destailleur
9312005318 NEW Move accountancy features into a dedicated menu 2017-08-29 12:43:47 +02:00
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
Laurent Destailleur
d975e7f442 Work on 6.0 look and feel 2017-04-01 12:46:47 +02:00
Laurent Destailleur
cab944a1a1 Merge pull request #6602 from aspangaro/6.0-multijournal 
New : [FP17] Accounting multi-journals
 2017-03-31 17:45:10 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Alexandre SPANGARO
aa924bf010 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 
# Conflicts:
#	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-03-27 22:35:06 +02:00
Laurent Destailleur
664380d304 Css enhancement 2017-03-23 21:24:57 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Laurent Destailleur
7dd0f14563 Fix link to reconciliated function 2017-03-16 21:03:35 +01:00
Laurent Destailleur
68d3a93027 Fix link to reconcile 2017-03-16 20:36:51 +01:00
Laurent Destailleur
6c392fad9f Fix CSS 2017-03-14 14:06:55 +01:00
Laurent Destailleur
ec7d48931e Merge duplicate menus/page on projects 2017-03-14 13:49:04 +01:00
Laurent Destailleur
0a0797e797 Rename menu entry 2017-03-03 13:36:38 +01:00
Laurent Destailleur
fb88eaf2a4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-02-23 02:55:50 +01:00
Laurent Destailleur
d5bb208957 Clean admin menu entries 2017-02-22 02:19:50 +01:00
Laurent Destailleur
bb72121179 Fix menu loading 2017-02-22 01:47:22 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Alexandre SPANGARO
1401e9267b [FP17] Modify menu for multijournal 2017-02-21 07:09:58 +01:00
Laurent Destailleur
a8129ce46e Fix transaction/sql error 2017-02-20 11:49:27 +01:00
Laurent Destailleur
702ad5bcde Fix menus 2017-02-20 11:29:30 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not 
admin user.
 2017-02-20 11:21:38 +01:00
Laurent Destailleur
8d03f86f45 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:10:46 +01:00
Alexandre SPANGARO
d7614af96e Fix : Link to loan admin isn't required, already support by page default account 2017-02-14 06:45:12 +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
8e733ca2fe Remove menu entry that is not reserved to admin users frmo admin area. 2017-02-07 19:58:49 +01:00
arnaud
6d3e43ddaf NEW Report page and menu for suppliers paiements 2017-02-03 16:34:14 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
Laurent Destailleur
9d6f84c3a0 FIX Try a better fif for #6074 2017-01-18 16:27:23 +01:00
Laurent Destailleur
f00f3101d9 Merge pull request #6013 from aljawaid/develop 
NEW: Make Top Menu Entries Independent Translation Strings
 2017-01-07 20:45:44 +01:00
Laurent Destailleur
b777ec79f2 Fix contextpage implementation into skeleton 2016-12-23 10:38:27 +01:00
Laurent Destailleur
ae185105d6 Merge pull request #6064 from defrance/patch-48 
Change left menu name of categorie
 2016-12-01 21:47:21 +01:00
BENKE Charlie
c23919c51a change left menu name of categorie 
It is impossible to add sub-menus to other categories left menus if not...
 2016-11-30 09:41:33 +01:00
Laurent Destailleur
d86c3931e2 Fix translation 2016-11-30 09:09:09 +01:00
IJ
636fbb476c Add Unique Top Menu Translation 
Add unique top menu translation for Tools so it can be better translated separately from other words/links using the same text.
 2016-11-19 10:49:12 +00:00
IJ
86d195fa81 Add Unique Top Menu Translation 
Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text.
 2016-11-19 10:37:15 +00:00
IJ
056b76a831 Better Separator for Products/Services in Top Menu 
Easier to read when both modules are enabled
 2016-11-19 10:34:22 +00:00
Laurent Destailleur
4fd2335bbf Fix var name 2016-11-07 10:14:04 +01:00
Laurent Destailleur
4681c84e1d Better responsive 2016-11-06 12:16:10 +01:00
Laurent Destailleur
6661773a06 Clean menu 2016-11-03 16:40:55 +01:00
Juanjo Menent
a59cf0e13b Merge pull request #5935 from aspangaro/5.0-p32 
Accountancy - Add binding and journal for expense reports
 2016-10-28 11:25:21 +02:00
Laurent Destailleur
75695fafa6 Merge pull request #5917 from aspangaro/5.0-p31 
Accountancy - Add menu expense report accounts in configuration
 2016-10-26 11:03:00 +02:00
aspangaro
883446c5bb Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-10-25 22:09:40 +02:00
Laurent Destailleur
5d655d47fe Enhance css 2016-10-25 12:36:14 +02:00
aspangaro
dc727ebb3c Accountancy - Add binding and journal for expense reports 2016-10-24 06:41:32 +02:00
aspangaro
0d62148a0f Accountancy - Add menu expense report accounts in configuration 2016-10-24 06:27:20 +02:00
Laurent Destailleur
ab3cdfa16d Clean code 2016-10-24 00:33:39 +02:00
Laurent Destailleur
939afa9569 NEW Can make reconcile directly from bank entry list 2016-10-23 23:24:55 +02:00
Laurent Destailleur
14e78ef50b Mutualize code of 2 lists into one page. 2016-10-22 13:52:43 +02:00
Laurent Destailleur
50a5fe6fd9 Work on accounting module 2016-10-21 18:24:46 +02:00
Laurent Destailleur
f0365e49e2 Fix book keeper can edit accounting account of taxes 2016-10-21 18:05:26 +02:00
Laurent Destailleur
9eafff4a97 Debug module accounting 2016-10-21 17:41:05 +02:00
Laurent Destailleur
47d4b184cd FIX Size of top menu image when menu is not allowed 2016-10-21 17:24:22 +02:00
Laurent Destailleur
304a44ffc2 Debug accounting module 2016-10-21 14:48:55 +02:00
Laurent Destailleur
dada679110 Uniformise code 2016-10-18 12:16:12 +02:00
Laurent Destailleur
9cad437d5c Fix list in chart of account 2016-10-15 16:20:08 +02:00
Laurent Destailleur
170a2e9889 Fix menu 2016-10-15 15:54:58 +02:00
Laurent Destailleur
04c0e87d79 Work on accounting module 2016-10-15 15:51:28 +02:00
Laurent Destailleur
c689248211 The setup that must be done by the bookkeeper is removed from admin 
setup and move into setup of accountancy
 2016-10-15 14:38:43 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
Laurent Destailleur
7c1b74133a Debug accountancy module 2016-10-13 22:29:49 +02:00
Laurent Destailleur
93c848fcc5 Add page index for accountancy module 2016-10-06 17:43:10 +02:00
Laurent Destailleur
9ad96c2be3 Debug module accountancy expert 2016-10-05 20:50:47 +02:00
Laurent Destailleur
dff7f73dc9 Better terminology 2016-10-05 18:31:55 +02:00
Laurent Destailleur
2f7bdbaab3 Fix menu auto deployment for local tax 2016-10-04 10:53:38 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
504ee9c73e NEW Add system tool "Files integrity checker" to detect modified files 
for packaged versions.
 2016-09-30 12:01:06 +02:00
Laurent Destailleur
8d2ae73663 FIX Menu users not visible on dolidroid. 2016-09-30 10:56:35 +02:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
Laurent Destailleur
78c0945fe7 Fix menu switch on accountancy and picto of product not using correct 
type.
 2016-09-28 23:59:47 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
Laurent Destailleur
2acce85fab NEW Pagination available on list of users 2016-09-12 21:32:27 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
79f19f5c66 Fix missing a filter billed=0 into link of billable orders 2016-09-10 17:48:57 +02:00
Laurent Destailleur
6d6eceb0ca Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:38 +02:00
Laurent Destailleur
f440e78fa6 FIX quick search boxes when nojs or when using smartphone 2016-09-03 12:56:49 +02:00
Laurent Destailleur
b01d1979f8 Merge pull request #5680 from aspangaro/5.0-p7 
NEW: Move Expense report menu from module to menu files (Again)
 2016-09-02 18:39:49 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
aspangaro
b5f093436e NEW: Move Expense report menu from module to menu files (Again) 2016-08-30 21:43:17 +02:00
florian HENRY
56f0ffee0b add category entry menu into auguria menu sql 2016-08-29 10:47:13 +02:00
florian HENRY
a4ce756724 Manage project category 2016-08-29 10:32:00 +02:00
Laurent Destailleur
03c30c487c Uniformise code 2016-08-22 13:46:38 +02:00
Laurent Destailleur
57cbda416b Minor fix on stock 2016-08-08 20:41:49 +02:00
Laurent Destailleur
2133b1c3b5 NEW Table with list of lots/serial can be viewed (module product batch). 2016-08-08 20:31:03 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
5f0951dcda Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:20:40 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank 
tranfert for payements
 2016-07-30 17:28:18 +02:00
Laurent Destailleur
f54946bacb Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
 2016-07-28 10:10:58 +02:00
Laurent Destailleur
dfa33bf173 Fix men unot visible 2016-07-28 10:09:13 +02:00
Laurent Destailleur
7e37cbb9e3 Fix resource module can't work because mandatory data not available. 2016-07-27 19:16:21 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
5fa8a6c311 Fix to avoid pb of performances 2016-07-27 17:40:19 +02:00
Laurent Destailleur
3d2dc3c66e NEW Each user can select its landing page. 2016-07-26 21:12:52 +02:00
Laurent Destailleur
8504e09e72 Fix permission to enter time spent 2016-07-09 12:35:12 +02:00
Laurent Destailleur
0be23553a4 Fix menu closing 2016-06-29 19:43:42 +02:00
Laurent Destailleur
d1850be261 Fix conflict in leftmenu value for projet menu 2016-06-29 17:00:05 +02:00
Laurent Destailleur
5f5328c3d8 FIX Link in menu when using left menu editor was wrong. 
FIX Updating an entry with menu editor did not save fk_leftmenu.
 2016-06-29 14:09:18 +02:00
Laurent Destailleur
5222b78e95 FIX property of bank account were lost if an error occured during 
saving.
 2016-06-25 14:20:23 +02:00
Laurent Destailleur
b953e8f364 Minor fix 2016-06-21 12:15:41 +02:00
Laurent Destailleur
195fcc5653 Minor fixes 2016-06-20 11:43:53 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
34c741bf0d FIX CSS and responsive behaviour (feature with a menu hider is on on 
smarpthone)
 2016-06-17 16:28:16 +02:00
Laurent Destailleur
48f30b5ef1 Cleaner menu 2016-06-17 12:39:00 +02:00
Laurent Destailleur
1396f11b77 css fix 2016-06-12 20:31:38 +02:00
Laurent Destailleur
65cbf1623b Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER 2016-06-12 20:24:05 +02:00
Laurent Destailleur
74e59a1bc4 Debug prototype feature "testmenuhider" 2016-06-10 18:41:10 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
 2016-06-01 17:59:50 +02:00
Laurent Destailleur
2290f6a123 FIX Menu statistics was not visible if module proposal was not enabled 2016-05-30 13:11:44 +02:00
Laurent Destailleur
7278d1f2c6 NEW Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check 
deposit feature.
 2016-05-27 10:38:15 +02:00
Laurent Destailleur
426454a67b Prepare the hide left menu icon 2016-05-22 19:32:08 +02:00
Xebax
2355a0c38c FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu. 2016-05-22 17:15:22 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
Laurent Destailleur
86076c2a01 Fix doxygen 2016-05-17 19:49:37 +02:00
Laurent Destailleur
1973f67d41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-17 01:11:14 +02:00
Laurent Destailleur
3a28935da3 Merge remote-tracking branch 'origin/3.9' into develop 2016-05-17 01:10:22 +02:00
Laurent Destailleur
cba0ef5693 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-05-14 00:44:38 +02:00
Laurent Destailleur
986119d2b5 Start debug 2016-05-12 21:32:24 +02:00
Frédéric FRANCE
3607f1a296 Correction for Auguria Menu Accounting Expert 
Entry cause blank windows
 2016-05-09 22:15:00 +02:00
Laurent Destailleur
1032583b02 Better support for accessiblity 2016-05-09 14:59:59 +02:00
frederic34
17463b4927 categories account like other categories 2016-04-30 14:45:24 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture 
change before the freeze)
 2016-04-23 15:37:22 +02:00
Maxime Kohlhaas
72ef11f593 Fix bank submenu error 2016-04-22 11:59:55 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page 
& review
 2016-04-17 15:44:04 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Marcos García de La Fuente
b9de3d5852 FIX #4442 Missing translation in Banks menu 
Close #4442
 2016-04-09 23:03:00 +02:00
Laurent Destailleur
01e538fa78 Merge pull request #4942 from aspangaro/4.0-p16 
NEW: Move HRM area page in HRM directory
 2016-04-08 20:51:17 +02:00
Laurent Destailleur
a43a0a3f4c Debug module loan and disable non working features 2016-04-06 11:21:55 +02:00
aspangaro
c6aabd3f34 NEW: Move HRM area page in HRM directory 2016-04-04 05:29:12 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +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
aspangaro
0b1a689a24 FIX: Some typo on auguria menu 2016-03-20 08:08:28 +01:00
aspangaro
57ebb7c997 NEW: Move Expense report menu from module to menu files 2016-03-20 07:34:48 +01:00
Laurent Destailleur
d4c6c4c140 NEW Holiday is a RH module. All RH module provides by default visilibity 
on users of its hierarchy.
 2016-03-14 21:22:49 +01:00
Laurent Destailleur
5bd5323c93 Finished to move the mergepdftool dedicated page into the generic "mass 
actions" feature.
 2016-03-10 12:11:11 +01:00
Marcos García de La Fuente
ff83dd9afe Replaced account type comparisons with TYPE constants 2016-03-02 11:08:57 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module 
is on)
 2016-02-18 23:21:02 +01:00
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +01:00
aspangaro
a8ead1d44c Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 
Correct conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-15 06:31:34 +01:00
aspangaro
b47252fcb6 Modifiy menu for accountancy module - New balance feature 2016-02-11 06:39:02 +01:00
Florian HENRY
ef7e245432 g 2016-02-09 19:23:17 +01:00
Florian HENRY
4401995540 Accountancy feature 2016-02-09 19:22:52 +01:00
Florian HENRY
44e39519b0 add accountancy balance 2016-02-09 19:20:03 +01:00
Laurent Destailleur
cfa3b16637 Menu entries for accountancy are shown when menu entry is selected and 
not all the time
 2016-02-07 22:47:46 +01:00
aspangaro
9d427d2248 Fixed: Missing link in eldy menu to init accountancy 2016-02-07 07:41:53 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
aspangaro
c77fda5128 New accountancy menu for auguria 2016-01-31 07:31:48 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
ce02f05d43 Translation of dashboard 2016-01-25 17:18:17 +01:00
Laurent Destailleur
467dc12a7b NEW Module "Supplier commercial proposal" (price request) is set to 
stable status.
 2016-01-25 12:33:38 +01:00
Laurent Destailleur
c1ebdd3b4f Default url is home 2016-01-24 11:35:33 +01:00
aspangaro
73d5e7036f Refactoring eldy menu to test 2016-01-24 08:21:18 +01:00
aspangaro
e5808f876d Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6 2016-01-24 07:04:20 +01:00
Laurent Destailleur
03461d124a Fix activation of cron jobs by external module 
Clean code for task lists pages.
 2016-01-19 23:45:03 +01:00
Laurent Destailleur
4a009d2ad2 NEW On translation admin page, admin can overwrite a translation value. 2016-01-16 00:48:14 +01:00
Laurent Destailleur
23e90974c4 Prepare to split module supplier into supplier_order and 
supplier_invoice
 2016-01-14 13:24:49 +01:00
Laurent Destailleur
23dd6b8388 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and 
SOCIETE_DISABLE_CUSTOMERS
 2016-01-14 12:35:55 +01:00
Laurent Destailleur
381eea0dbf Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-12 23:10:25 +01:00
aspangaro
a88773cb81 Fix: Some problems presentation on accountancy module 2016-01-10 15:44:14 +01:00
aspangaro
af9e46d179 Fix: Wrong language file for 2 menu entries in accountancy module 2016-01-10 06:56:20 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
095ee47724 Merge pull request #4268 from aspangaro/develop-a7 
Accountancy Review page to init accountancy on product/service
 2016-01-09 17:45:42 +01:00
Juanjo Menent
400a1f9825 Merge pull request #4253 from aspangaro/develop-a5 
Move fiscal year from accountancy module to configuration of Dolibarr
 2016-01-09 17:42:29 +01:00
Laurent Destailleur
a8758fa5b7 Bug war week-end: Fix a duplicate page on holiday, fix missing badge on 
some documents tabs.
 2016-01-09 01:54:46 +01:00
aspangaro
2c1ff3ca47 Merge remote-tracking branch 'Upstream/develop' into develop-a7 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2015-12-31 06:07:08 +01:00
Florian HENRY
930eb6dccf FIX : bug with head.lib.js if MAIN_MAX_DECIMALS_SHOWN use ... 
FIX : List of supplier order to invoice must use billed new column
 2015-12-23 14:15:30 +01:00
aspangaro
e38106019d Add conditions to show menu on modules admin tools 2015-12-20 08:11:33 +01:00
aspangaro
e043098cc3 Add link in modules tools & correct auguria menu 2015-12-20 07:58:54 +01:00
aspangaro
8b3a5ac06f Correct on auguria module 2015-12-19 06:39:25 +01:00
aspangaro
dc6143b6c7 Depend on accountancy module activation for the moment 2015-12-19 06:25:24 +01:00
aspangaro
ea73e0253c Move fiscal year from accountancy module to configuration of Dolibarr 2015-12-17 13:09:46 +01:00
Laurent Destailleur
bcadc33e31 Debug visibility on task/projects 2015-12-04 15:37:28 +01:00
Laurent Destailleur
480a398f36 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/holiday/card.php
	htdocs/resource/list.php
 2015-12-03 13:06:20 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
480623a6d5 Uniformize GUI. All lists must have a search on status at end and last 
column is dedicaded to future "mass action checkbox".
 2015-11-29 13:03:46 +01:00
Laurent Destailleur
a6d8f943df Fix several bugs into leave requets module 2015-11-26 02:12:37 +01:00
aspangaro
f9e82721d7 Fix: Auguria Menu & wrong table in dictionary HRM 2015-11-22 20:13:48 +01:00
Laurent Destailleur
a906774595 Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order 
NEW 3.9 add billed status for supplier order
 2015-11-21 00:20:17 +01:00
aspangaro
ad457b416d Use menu & add mode 'employee' in user/index.php 2015-11-17 22:51:34 +01:00
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
c2ec4a4fd2 Move online help link at a better place (top right). Link is also always 
visible.
 2015-11-14 22:49:34 +01:00
Laurent Destailleur
2bd0f04d8f Add feature to get nb of top menu entrie 
Fix translation of units
 2015-11-12 00:48:37 +01:00
Laurent Destailleur
24dff1d842 NEW Statistic graphs on products offer a filter on product type (product 
/ service or both)
 2015-11-08 00:35:30 +01:00
Laurent Destailleur
4e64230ac9 NEW Add chart of product statistics 2015-11-07 16:25:14 +01:00
Laurent Destailleur
2c682022cf NEW The search box and the bookmarks are now rendered by the menu 
manager.
 2015-10-30 09:36:57 +01:00
Laurent Destailleur
8d24adc97e Remove 2 other duplicated pages. There is only one page now for all list 
of thirdarties (with a parameter type to have it specialized per
customer, prospect or supplier profile).
 2015-10-23 13:52:51 +02:00
Laurent Destailleur
474692e71a Remove duplicate page fourn/list.php 2015-10-22 09:48:16 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
143c1e03f8 FIX Missing menu entry for list of thirdparties when using auguria menu 
manager
 2015-10-05 10:30:49 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
ee683049a6 Enhance CSS capabilities 2015-09-22 11:24:31 +02:00
Laurent Destailleur
8ff41a8ded Enhance performance of option MAIN_OVERWRITE_TRANS_ 2015-09-17 15:35:51 +02:00
Laurent Destailleur
b94fb9e1f3 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 18:22:10 +02:00
Laurent Destailleur
67b7345e83 Fix the feature to log a cheque as returned. 
Fix duplicate parameter mainmenu and leftmenu into url
 2015-09-12 18:00:19 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
4b97fae28f Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-11 07:52:06 +02:00
aspangaro
ae6f547ba5 Merge remote-tracking branch 'Upstream/develop' into develop-62 2015-09-09 20:57:28 +02:00
Laurent Destailleur
1b9b0082ba Merge pull request #3387 from defrance/patch-75 
NEW: add intervention Aera
 2015-09-05 11:19:37 +02:00
aspangaro
f33cd85c04 New: refund VAT 2015-09-05 06:15:27 +02:00
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
a84696230b Fix the translation page must be visible for all languages, except 
en_US.
 2015-09-01 16:11:58 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
BENKE Charlie
d1c540157e add link to fichinter area 
change inter menu
 2015-08-15 21:26:18 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/resultat/clientfourn.php
 2015-07-30 15:07:22 +02:00
Laurent Destailleur
6adc3ba604 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2015-07-30 14:54:33 +02:00
Laurent Destailleur
52b433a3f1 Comment 2015-07-29 13:11:23 +02:00
Laurent Destailleur
fdbfc7facd Fix missing language load 2015-07-19 15:48:35 +02:00
Marcos García de La Fuente
8505e91469 Fix: [ bug 1791 ] Margin menu not available if any Finance module is not enabled 2015-07-19 13:46:25 +02:00
Laurent Destailleur
4d6ce2a1de Fix: Can't view thirdparties that are not customer nor prospect nor 
supplier.
 2015-07-15 12:42:50 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
312281f4d4 Debug askpricesupplier 
Try to continue work on position of menu entries.
 2015-07-02 22:43:51 +02:00
Laurent Destailleur
a29ca43943 Prepare merge of merge tools and invoice list 2015-06-30 14:32:17 +02:00
Laurent Destailleur
55cb103ab0 Maxi debug of new module leave requests 2015-06-27 13:01:44 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks 
Uniformize page name societe.php into list.php
 2015-06-22 15:48:48 +02:00
Laurent Destailleur
4c7ccf6145 NEW Can filter on contact status in prospect list. Removed deprecated 
menu entry.
 2015-06-05 10:49:02 +02:00
Laurent Destailleur
331ebbdd73 Fix behaviour on grey/visible menu must be same everywhere on 
application.
 2015-06-04 11:42:24 +02:00
Laurent Destailleur
390c7d8e65 Fix link to prospect with filter on commercial status 
Enhance natural_search method to allow to search on several ids.
 2015-05-22 15:19:27 +02:00
Laurent Destailleur
ac4bd7d441 Uniformize code 2015-05-04 11:41:30 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
94589b9935 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55 Uniformize feature between invoice and merging tool 2015-04-19 23:15:24 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Maxime Kohlhaas
7b035d3b5f Fix : menu financial was not displayed when only supplier module is activated 2015-04-18 20:11:19 +02:00
jfefe
fe01c4470d Show tools menu when activating resource module 2015-04-18 15:04:44 +02:00
Maxime Kohlhaas
8db50e4606 Fix : menu for product batch 2015-04-18 01:39:41 +02:00
Maxime Kohlhaas
73a66f789c New : shipment lists by status 2015-04-18 01:21:22 +02:00
Laurent Destailleur
8ebad7a395 A serious rewrite of a lot of code to have the module batch number 
stable.
 2015-04-12 17:08:14 +02:00
Laurent Destailleur
0987aa1c74 Bad trans key 2015-04-08 17:42:28 +02:00
Juanjo Menent
1f4a131691 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/product/stock/product.php
 2015-04-07 20:43:27 +02:00
Juanjo Menent
d7ba9b3312 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/stock/mouvement.php
 2015-04-07 20:40:48 +02:00
Juanjo Menent
9d8cb459f1 Fix: Bad permission assignments for stock movements actions 2015-04-07 20:28:45 +02:00
Laurent Destailleur
02e8879d3b NEW Feature to build a merged pdf with all unpaid invoice can work for 
paid invoices.
 2015-04-06 19:11:31 +02:00
Laurent Destailleur
b66d8c9afc Merge pull request #2496 from aspangaro/develop-ER-patch1 
Fixed: HRM menu is not activated when only Expense Report module is acti...
 2015-03-30 01:59:50 +02:00
aspangaro
a715ccfcb8 Fixed: HRM menu is not activated when only Expense Report module is activated 2015-03-29 15:11:41 +02:00
aspangaro
ce6df7c022 Debug 2015-03-29 09:20:32 +02:00
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00
aspangaro
679391d337 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-25 20:59:48 +01:00
Laurent Destailleur
ab739e162c Merge remote-tracking branch 'origin/3.7' into develop 2015-03-25 18:11:29 +01:00
Laurent Destailleur
a32fc9efce Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set. 
Avoid logo to overwrap box with css.
Add help text.
 2015-03-24 14:08:56 +01:00
Laurent Destailleur
f75c115140 Fix translation 
Fix permission not managed into get_menudiv.php
 2015-03-24 11:19:51 +01:00
aspangaro
9d34b40897 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/compta/bank/account.php
 2015-03-24 05:28:57 +01:00
Laurent Destailleur
efe9c21b81 Merge pull request #2382 from aspangaro/develop-loan 
NEW: Module loans
 2015-03-23 23:28:57 +01:00
Marcos García de La Fuente
c6ad35e001 Implemented statuses submenu for List menu of supplier and customer invoices. 
Menu "Pending payment" has been moved to the "List" submenu.
 2015-03-23 13:42:50 +01:00
aspangaro
ad0f1aae6b Move loan in htdocs 2015-03-22 20:19:22 +01:00
aspangaro
414d4c6432 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +01:00
aspangaro
15e50ed24f Update works 2015-03-21 06:21:34 +01:00
aspangaro
c4a580723d Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-20 06:36:06 +01:00
aspangaro
fa41132372 Move module Don in htdocs->donations 2015-03-19 05:22:42 +01:00
Laurent Destailleur
5d4d8151c1 Work on new timesheet input pages. 2015-03-18 11:04:50 +01:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00:00
aspangaro
c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-02 21:05:38 +01:00
Laurent Destailleur
a0f8b39250 Prepare code for a perday week timesheet input of time spent. 2015-03-01 17:45:36 +01:00
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +01:00
Laurent Destailleur
70c778c728 I keep this feature hidden, because according to package target, 
dolibarr does not contains same files. We must first find a solution
before making this feature public.
 2015-02-24 15:49:39 +01:00
aspangaro
3aa6c8c855 Correct auguria menu 2015-02-21 15:19:18 +01:00
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
frederic34
ad3e91dc9f WIP 2015-02-21 14:06:33 +01:00
frederic34
2b19f75460 Files Integrity Checker 2015-02-19 21:26:03 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Laurent Destailleur
17d2368bdc Fix we must use short key 2015-02-11 15:07:20 +01:00
Laurent Destailleur
370f6b907e Fix we must use short key 2015-02-11 14:44:40 +01:00
Laurent Destailleur
b654ffb627 New: Add option SUPPLIER_ORDER_HIDE_VALIDATED. So a module can remove 
this step. Useless when all users have permission to approve supplier
orers.
 2015-02-05 11:58:40 +01:00
Laurent Destailleur
3f042fb558 New: Introduce option PROJECT_HIDE_TASKS for people using project only 
as transversal analytic key and not to manage tasks.
 2015-02-02 13:27:55 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
67c1ae8593 Fixed: condition to show menus 2015-01-30 15:47:27 +01:00