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 |
|
Laurent Destailleur
|
c54355b63a
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2015-01-16 10:44:41 +01:00 |
|
Laurent Destailleur
|
806477977d
|
Fix: css
|
2015-01-14 13:51:21 +01:00 |
|
Laurent Destailleur
|
f8b58605c6
|
Better organisation of entries into security setup area
|
2015-01-12 13:21:16 +01:00 |
|
Laurent Destailleur
|
13132ef2ed
|
Better organisation of entries into security setup area
|
2015-01-12 13:20:27 +01:00 |
|
Laurent Destailleur
|
fc78d632d3
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
|
2015-01-09 23:09:10 +01:00 |
|
aspangaro
|
f14ea7b649
|
Add module accountancy expert in auguria menu
|
2015-01-03 15:07:54 +01:00 |
|
Laurent Destailleur
|
5ead994955
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
ChangeLog
|
2014-12-26 04:57:55 +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
|
f884f16564
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/admin/boxes.php
htdocs/comm/action/card.php
htdocs/core/class/html.formfile.class.php
|
2014-12-03 12:54:42 +01:00 |
|
Laurent Destailleur
|
a796fea1c8
|
Merge pull request #2114 from frederic34/patch-4
Fix mix of space and nbsp
|
2014-12-02 19:56:04 +01:00 |
|
Frédéric FRANCE
|
d0c9b6e9ef
|
Fix Typo
|
2014-11-30 23:23:30 +01:00 |
|
Laurent Destailleur
|
def4ab5065
|
Fixed: Missing picto
Fixed: Menu auguria
Fixed: Default label
|
2014-11-29 20:41:09 +01:00 |
|
Frédéric FRANCE
|
369f802112
|
Fix mix of space and nbsp
|
2014-11-28 08:50:37 +01:00 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Marcos García de La Fuente
|
a927a04421
|
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:55:32 +01:00 |
|
Laurent Destailleur
|
9c107790e4
|
Merge pull request #2079 from marcosgdf/bug-1705
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:53:54 +01:00 |
|
Marcos García de La Fuente
|
bd765ef3ae
|
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:17:09 +01:00 |
|
Laurent Destailleur
|
97a6bd842d
|
Minor fixes.
|
2014-11-23 12:39:53 +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
|
9c3fa5a9eb
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2014-11-09 07:26:14 +01:00 |
|
Laurent Destailleur
|
4c1b1408ed
|
Fix: Removed duplicate menu entry
|
2014-11-07 23:15:02 +01:00 |
|
aspangaro
|
840dfd780d
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2014-11-07 21:28:39 +01:00 |
|
aspangaro
|
25433120e6
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2014-11-04 06:16:03 +01:00 |
|