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
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
Laurent Destailleur
f8b58605c6
Better organisation of entries into security setup area
2015-01-12 13:21:16 +01:00
aspangaro
f14ea7b649
Add module accountancy expert in auguria menu
2015-01-03 15:07:54 +01:00
Marcos García de La Fuente
146bba90e7
Fix: [ bug #1724 ] Can't add a submenu to projects
2014-12-25 18:42:26 +01:00
Laurent Destailleur
def4ab5065
Fixed: Missing picto
...
Fixed: Menu auguria
Fixed: Default label
2014-11-29 20:41:09 +01:00
aspangaro
31b90cf383
Add 1st version of calculator but need work
2014-11-17 06:38:06 +01:00
aspangaro
15e44b6e28
Correct Auguria menu
2014-11-10 06:39:37 +01:00
aspangaro
25433120e6
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 06:16:03 +01:00
Laurent Destailleur
f498921715
Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
...
GPCsolutions-droposcommerce
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/vi_VN/admin.lang
htdocs/langs/vi_VN/shop.lang
2014-10-13 00:50:51 +02:00
aspangaro
a0b4a0a3cd
Update menu auguria
2014-10-01 07:32:03 +02:00
Laurent Destailleur
e35135d5b1
Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into
...
develop
Conflicts:
htdocs/compta/ventilation/card.php
htdocs/compta/ventilation/fournisseur/card.php
htdocs/compta/ventilation/fournisseur/list.php
htdocs/compta/ventilation/list.php
htdocs/core/menus/init_menu_auguria.sql
2014-09-29 16:31:35 +02:00
Raphaël Doursenaud
f01e76f686
Removed unmaintaned OScommerce module
2014-09-29 15:22:48 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
aspangaro
6d26a7a46d
Merge remote-tracking branch 'Upstream/develop' into develop-accounting
2014-09-20 06:36:31 +02:00
Laurent Destailleur
ca3c5d9513
Fix: invalid list of params
...
Fix: loading of sql menu
2014-09-19 14:36:55 +02:00
aspangaro
ab9226aab6
Delete elements have a link with old module ventilation - Replace today by module Accounting Expert
2014-09-19 05:55:54 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
Laurent Destailleur
900cdd5368
Qual: Removed duplicate page.
2014-09-17 15:24:01 +02:00
Laurent Destailleur
e3fede595f
Removed all triggers _BUILDOC. Building a document is not a business
...
status change but a technical action. So hooks must be used instead.
Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch
Conflicts:
htdocs/core/modules/project/modules_project.php
htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
2014-08-22 00:01:53 +02:00
aspangaro
2f4e1f09e6
Fix :: Entries salaries into menu doesn't appears when this module is activated alone - Needed module tax at the moment
2014-08-21 06:47:24 +02:00
Laurent Destailleur
21c7972f7e
Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module
...
is not enabled.
2014-07-28 20:34:51 +02:00
Laurent Destailleur
910eeee4b8
Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module
...
is not enabled.
2014-07-28 20:00:46 +02:00
Laurent Destailleur
b964f9e9e3
New: Add info page about browser.
...
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
2014-07-27 14:13:25 +02:00
aspangaro
dce9c2bc76
Fiscal year - 1st step
2014-05-28 05:34:10 +02:00
Laurent Destailleur
f95c87f1d6
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
...
work but it does not enable it
2014-05-10 18:57:04 +02:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
aspangaro
b09d7065c9
Fix :: Failed to apply auguria_menu since integration of salary payment in tax module
2014-03-16 17:30:58 +01:00
aspangaro
048b3c01ce
Add salary payment in tax module - Link to user.
...
Necessary for future hrm module.
2014-03-06 21:21:16 +01:00
Laurent Destailleur
860ca15cfc
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2014-02-17 15:27:30 +01:00
Laurent Destailleur
de64ce5b2a
Fix: user right on Holiday for month report nor working
2014-02-17 00:09:48 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
d2d0d715a9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/install/mysql/data/llx_c_tva.sql
2014-01-04 19:02:56 +01:00
Laurent Destailleur
2ee5076970
Problem of key of language into auguria menu
2014-01-04 18:57:57 +01:00
Laurent Destailleur
305ca25267
New: Add menu entry to page massstockmove.php
2013-10-20 14:05:51 +02:00
Laurent Destailleur
f4a83f0851
Qual: Debug of replenishment feature
2013-10-09 20:30:49 +02:00
Laurent Destailleur
c4d3307bfa
Qual: Normalize file name.
2013-07-26 11:36:36 +02:00
Florian Henry
26894d9749
Fix bug in SQL
2013-07-22 10:17:31 +02:00
Florian Henry
bbacef6815
Add category contact into left menu entry for augeria theme
2013-07-22 10:15:48 +02:00
Maxime Kohlhaas
76870622e4
Add turnover report by product / serv
2013-06-25 14:54:29 +02:00
Laurent Destailleur
570275cd76
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/opensurvey.lang
htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Laurent Destailleur
ec2e4c8a8b
Fix: parenthesis at wrong place
2013-06-19 22:58:35 +02:00
