lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54,478 Commits 43 Branches 150 Tags 886 MiB
16e3a3d294
Commit Graph

54478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
16e3a3d294 Fix datadir not defined 
Fix can't use the cron script on cloud services since the admin user may
have different values.
 2016-07-06 22:49:08 +02:00
Laurent Destailleur
d22ef4f371 Fix Do not show status 2016-07-06 22:35:12 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
Laurent Destailleur
8505c5db09 Code comment 2016-07-06 13:26:49 +02:00
Laurent Destailleur
148f2e4c00 Merge pull request #5449 from fmarcet/3.8 
Fix: Don't load extrafields on orderstoinvoice
 2016-07-06 11:56:05 +02:00
Laurent Destailleur
b77edf9f32 Merge pull request #5448 from atm-maxime/fix_task_odt_model 
FIX task ODT company object not correctly retrieved
 2016-07-06 11:55:13 +02:00
Laurent Destailleur
840601a491 Merge pull request #5451 from grandoc/develop 
internationalization of code comment
 2016-07-06 11:53:37 +02:00
Laurent Destailleur
646e6f4996 Merge pull request #5454 from atm-alexis/FIX_develop_add_post_into_print_link 
FIX add POST key on print link
 2016-07-06 11:49:45 +02:00
Laurent Destailleur
759b265eeb Merge pull request #5447 from atm-florian/dev_fix5446 
FIX #5446 Extrafields select list filter on other select list do not work
 2016-07-06 11:46:21 +02:00
Laurent Destailleur
16c1816e7c Merge pull request #5445 from atm-florian/develop 
FIX hidden extrafield feature edit
 2016-07-06 11:35:19 +02:00
Laurent Destailleur
f39558ebb0 Fix ĉonf not defined 2016-07-06 11:24:51 +02:00
Laurent Destailleur
0af555126c Fix PHPCS 2016-07-06 11:23:32 +02:00
Laurent Destailleur
8e9a7cb629 Fix var not always defined 2016-07-06 11:20:09 +02:00
Laurent Destailleur
c360189d94 Code comment 2016-07-06 11:14:17 +02:00
Laurent Destailleur
8e19b235f1 Code comment 2016-07-06 11:06:49 +02:00
Laurent Destailleur
9249a7c736 Add entry to run stop/start doliwamp as admin 2016-07-06 11:05:23 +02:00
Laurent Destailleur
a2e26e6ba0 Upgrade apache and php for DoliWamp but not Mysql 2016-07-06 10:49:19 +02:00
Alexis Algoud
97eedb866b FIX add POST key on print link (avoid action in case of) 
in order to keep filter on list and other case
 2016-07-06 10:36:58 +02:00
Laurent Destailleur
da5228aaa9 Selection of fields ok for interventions 2016-07-06 10:28:34 +02:00
Laurent Destailleur
10885f0cf2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-06 09:58:15 +02:00
Laurent Destailleur
6749e60079 Fix: Test to manage corrupted data 2016-07-05 18:36:10 +02:00
Laurent Destailleur
a669b61b69 Code comment 2016-07-05 18:33:13 +02:00
philippe grand
770da29de4 internationalization of code comment 2016-07-05 17:20:32 +02:00
fmarcet
50c5efc374 Fix: Don't load extrafields on orderstoinvoice 2016-07-05 16:41:46 +02:00
Laurent Destailleur
b4c8822281 Fix style of text after ref on invoices 2016-07-05 16:27:14 +02:00
Maxime Kohlhaas
d658e2cf31 FIX task ODT company object not correctly retrieved 2016-07-05 16:04:18 +02:00
florian HENRY
fc2e7fb1ad FIX #5446 2016-07-05 15:45:33 +02:00
florian HENRY
22f028d101 FIX hidden extrafield feature edit 2016-07-05 09:05:10 +02:00
Laurent Destailleur
23cac5b157 FIX link to check prof id was hardcoded instead of using dedicated 
function
 2016-07-04 10:28:11 +02:00
Laurent Destailleur
fa6570d9cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-03 21:14:52 +02:00
Laurent Destailleur
c24d68a038 Picto for expense report 2016-07-03 21:14:45 +02:00
Laurent Destailleur
0649c41bbf Fix: list of fields used for quick search was not visible on expense 
reports
 2016-07-03 21:06:02 +02:00
Laurent Destailleur
9992704398 Fix: viewimage must not check login for resources medias 2016-07-03 20:50:28 +02:00
Laurent Destailleur
de157d9099 Fix quick search on tasks 2016-07-03 20:15:26 +02:00
Laurent Destailleur
bad758f248 Fix syntax error 2016-07-03 19:10:52 +02:00
Laurent Destailleur
f3eb564d5f Some fix for mysql5.6.17 2016-07-03 15:24:01 +02:00
Laurent Destailleur
32acdaecc1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-03 13:14:44 +02:00
Laurent Destailleur
ce3f45c2a2 Debug of doliwamp for 4.0 2016-07-03 13:14:33 +02:00
Laurent Destailleur
e9797538b3 Merge pull request #5432 from atm-florian/3.9 
FIX #4926
 2016-07-02 20:31:58 +02:00
Laurent Destailleur
ad82909d08 Merge pull request #5431 from atm-florian/3.8 
FIX #4756
 2016-07-02 20:31:36 +02:00
Laurent Destailleur
6a903b17e6 Merge pull request #5440 from frederic34/patch-8 
FIX Search on billed
 2016-07-02 20:30:51 +02:00
Laurent Destailleur
29cbab1647 Merge pull request #5438 from atm-arnaud/FIX_product_blocstat_without_module_enabled 
FIX product stats all bloc module without enabled test
 2016-07-02 20:29:41 +02:00
Laurent Destailleur
838852619e Merge pull request #5439 from atm-arnaud/FIX_ASK_DELETE_PAYMENT_SUPPLIER_INVOICE 
FIX form_confirm to delete payment on supplier invoice
 2016-07-02 20:28:18 +02:00
Laurent Destailleur
b654c7d6fe Merge pull request #5441 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2016-07-02 20:27:50 +02:00
Scrutinizer Auto-Fixer
a8b1699abb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-07-02 18:26:31 +00:00
Laurent Destailleur
3d72f788b9 Fix phpcs 2016-07-02 18:02:39 +02:00
Laurent Destailleur
fe86ef5774 Thirdparty into keyword, encoded with convToOutputCharset 2016-07-02 17:00:45 +02:00
Laurent Destailleur
9a75d40d56 Fix switching between web sites 2016-07-02 12:21:47 +02:00
Laurent Destailleur
525b2cf297 Fix: Edition of contract on intervention failed 2016-07-02 12:02:51 +02:00