Commit Graph

228 Commits

Author SHA1 Message Date
Laurent Destailleur
99f1876aa2 Merge pull request #1903 from aspangaro/develop-accounting
Patch Accounting Expert module
2014-09-18 17:24:40 +02:00
Laurent Destailleur
900cdd5368 Qual: Removed duplicate page. 2014-09-17 15:24:01 +02:00
aspangaro
28e20f1826 typo of link into eldy menu 2014-09-16 20:06:31 +02:00
Laurent Destailleur
2cfe088ee4 Better organization of accountancy menus
Fix: sql error with pgsql
2014-09-13 16:54:17 +02:00
aspangaro
8f818529a6 Remove right "accounting->access" & debug menu 2014-09-09 21:19:15 +02:00
aspangaro
7cc3fe9c95 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-09 20:41:19 +02:00
Laurent Destailleur
9e2a0cb671 Fix: debug of accountancy module 2014-09-09 09:46:57 +02:00
aspangaro
1223be1e5b Move language key into admin.lang file 2014-09-08 21:51:40 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00
aspangaro
354aee2457 Modify eldy menu 2014-09-03 21:01:24 +02:00
aspangaro
1389f75933 Don't show journals of module comptabilite when accounting expert module is enabled 2014-09-03 20:32:38 +02:00
aspangaro
9d08f4c5f5 Patch Accounting Expert module 2014-09-03 07:22:59 +02:00
aspangaro
def53d92bd Correct error menu 2014-08-31 14:10:48 +02:00
aspangaro
6d3b166340 Update dynamics menu 2014-08-31 13:58:42 +02:00
aspangaro
f9076162b6 Add dynamic link into accountancy menu to bank journal 2014-08-31 08:56:22 +02:00
aspangaro
bb45b8bbc5 Typo & admin menu 2014-08-28 07:37:29 +02:00
aspangaro
5b3be47b47 Merge branch 'Upstream/develop' 2014-08-28 07:28:45 +02:00
aspangaro
9b3a3a47c2 Add link chart of accounts in administration 2014-08-28 07:18:28 +02:00
aspangaro
6f8234dd60 Update Eldy menu 2014-08-28 07:13:33 +02:00
Regis Houssin
071c405bad Fix: error with php strict mode 2014-08-27 10:47:25 +02:00
Regis Houssin
9dafdf41bb Fix: error in strict mode 2014-08-26 09:51:00 +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
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
6d7b50d5d4 Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module
is not enabled.
2014-07-28 20:34:42 +02:00
Laurent Destailleur
f8b6b004cd Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module
is not enabled.
2014-07-28 19:58:29 +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
Maxime Kohlhaas
2e18fa88d1 Mauvais libellé utilisé pour statut commande 2014-07-25 14:03:41 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
aspangaro
9eaeaae2fb Merge branch 'Upstream/develop' 2014-07-05 08:48:51 +02:00
Juanjo Menent
747b6a9f94 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with reports
and payments
2014-07-04 12:50:55 +02:00
aspangaro
56785f1149 Merge branch 'Upstream/develop' 2014-06-24 06:10:47 +02:00
Laurent Destailleur
d3c5e93399 Fix: Menu entries not visible 2014-06-20 12:01:14 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
aspangaro
dce9c2bc76 Fiscal year - 1st step 2014-05-28 05:34:10 +02:00
Laurent Destailleur
20ec1e6ac8 Fix: Suppliers invoices must be visible if module supplier is on. 2014-05-23 19:55:40 +02:00
Alexis Algoud
197ff1a653 Add detailled view in supplier order as in customer order 2014-05-12 12:10:53 +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
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
71ca269c71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
2014-04-25 20:29:29 +02:00
Laurent Destailleur
196cf53dbd Fix: Pb of return values 2014-04-25 20:11:38 +02:00
Raphaël Doursenaud
96c0c43404 Qual: Missing global declaration 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
d717133d62 Qual: Removed dead code 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
b68fb41d28 Qual: Wrong type in method documentation 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
1c3c20105e Qual: Wrong type in method documentation 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
aa5d0b37b7 Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Laurent Destailleur
c1e349d110 Experiment hidden option MAIN_MENU_INVERT 2014-04-23 12:22:01 +02:00
Laurent Destailleur
56c7d14b9a We do not force disabling of ckeditor for phones. We let ckeditor
decide (currently ckeditor is disabled with android).
2014-03-31 13:25:40 +02:00
Laurent Destailleur
80088c87ac Fix: Some debugs of module categories 2014-03-18 00:20:39 +01:00