Commit Graph

131 Commits

Author SHA1 Message Date
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
5bd5323c93 Finished to move the mergepdftool dedicated page into the generic "mass
actions" feature.
2016-03-10 12:11:11 +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
b47252fcb6 Modifiy menu for accountancy module - New balance feature 2016-02-11 06:39:02 +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
467dc12a7b NEW Module "Supplier commercial proposal" (price request) is set to
stable status.
2016-01-25 12:33:38 +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
23e90974c4 Prepare to split module supplier into supplier_order and
supplier_invoice
2016-01-14 13:24:49 +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
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
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
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
aspangaro
ad457b416d Use menu & add mode 'employee' in user/index.php 2015-11-17 22:51:34 +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
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
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
f33cd85c04 New: refund VAT 2015-09-05 06:15:27 +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
52b433a3f1 Comment 2015-07-29 13:11:23 +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
65dafeee55 Uniformize feature between invoice and merging tool 2015-04-19 23:15:24 +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
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
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
9d34b40897 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
	htdocs/compta/bank/account.php
2015-03-24 05:28:57 +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