aspangaro
a0b4a0a3cd
Update menu auguria
2014-10-01 07:32:03 +02:00
aspangaro
f70e8b766f
Merge remote-tracking branch 'Upstream/develop' into develop-loan
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-09-29 20:40:53 +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
Florian HENRY
ce145cc056
Add cache excel export on harddrive with
...
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
2014-09-29 10:16:48 +02:00
aspangaro
250b57ca0a
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-28 14:00:26 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
aspangaro
a58025c601
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-09-23 21:24:29 +02:00
Florian HENRY
518d23f278
Add feature to order to invoice on supplier part
2014-09-23 16:28:29 +02:00
aspangaro
08b9e05425
New Module : Manage Financial Loan
2014-09-21 17:42:38 +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
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
0674667932
Fix: error with php strict mode
2014-08-27 10:46:42 +02:00
Regis Houssin
9dafdf41bb
Fix: error in strict mode
2014-08-26 09:51:00 +02:00
Regis Houssin
ca7ff0ecfa
Fix: error in strict mode
2014-08-26 09:50:26 +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
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
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
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
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
