lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,265 Commits 43 Branches 150 Tags 886 MiB
4.0.2
Commit Graph

47757 Commits

Author SHA1 Message Date
Juanjo Menent
5aa63ffe73 Merge pull request #5490 from simnandez/4.0 
FIX #5479 using uninitialized variable $socid and other stuffs
 2016-07-16 19:15:39 +02:00
Laurent Destailleur
970c4bea75 Fix minor css 2016-07-16 15:34:09 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
4b854fb33d Fix better error message when possible refering objects list is empty. 2016-07-16 14:37:35 +02:00
Laurent Destailleur
68227d91d9 FIX after enabling module expense report, the document template is not 
active by default.
 2016-07-16 14:14:28 +02:00
Juanjo Menent
a037e2f2d6 FIX #5479 using uninitialized variable $socid and other stuffs 2016-07-15 23:14:15 +02:00
Juanjo Menent
2ed446d014 FIX Option strict mode compatibility 2016-07-15 19:35:01 +02:00
Laurent Destailleur
0c5851d566 Fix CRLF 2016-07-15 14:49:48 +02:00
Laurent Destailleur
0f4f4ea61c FIX #5482 #5485 2016-07-15 14:22:49 +02:00
Laurent Destailleur
fdfe4d9ac5 Fix missing getFormMail as "addreplace" hook 2016-07-15 14:21:07 +02:00
Laurent Destailleur
258662e616 Fix: missing month of update in leave "view log" page. 2016-07-14 15:31:56 +02:00
Laurent Destailleur
241fd8db98 Fix css 2016-07-14 15:22:04 +02:00
Laurent Destailleur
9bd937a3bc Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-14 00:35:59 +02:00
Laurent Destailleur
10e7fa51fc Fix missing parameters to provide all information required for 
substitution hooks
 2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75 Fix missing badge 2016-07-13 22:21:18 +02:00
Juanjo Menent
015b941966 Merge pull request #5478 from simnandez/4.0 
Merge #5464 Fix: Prevent SQLiFix into 4.0
 2016-07-13 12:45:17 +02:00
Laurent Destailleur
c787e7f2a1 FIX Clear of filter should also reset categories and extrafields filter 
FIX Filter on categories should depends on context
 2016-07-13 12:03:30 +02:00
Juanjo Menent
fc5b308605 Merge remote-tracking branch 'upstream/develop' into 4.0 2016-07-13 12:00:50 +02:00
Juanjo Menent
df74fa37de Merge pull request #5464 from AppChecker/develop 
Fix: Prevent SQLi
 2016-07-13 08:45:00 +02:00
Laurent Destailleur
490336b2e8 Fix bad dependency. 2016-07-12 20:07:53 +02:00
Laurent Destailleur
73f574b649 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/repair.php
 2016-07-12 19:30:01 +02:00
Laurent Destailleur
baeedd3690 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-12 19:26:55 +02:00
Laurent Destailleur
f972b15f5f FIX #5068 2016-07-12 19:22:14 +02:00
Alexis Algoud
572b2fdec7 FIX dasboard wrong for late invoice 2016-07-12 15:01:43 +02:00
Laurent Destailleur
9c06e07f07 Code comment 2016-07-12 13:03:56 +02:00
Laurent Destailleur
dc138e20e7 FIX: Can't edit label 2016-07-12 10:58:32 +02:00
Laurent Destailleur
1756fdbc9f Popup on links not visible. 2016-07-11 12:59:07 +02:00
appchecker
f618f330b3 replace intval with GETPOST 2016-07-11 13:01:16 +03:00
appchecker
7facaac973 replace intval with GETPOST 2016-07-11 12:58:59 +03:00
appchecker
4b1dfbc2fb replace intval with GETPOST 2016-07-11 12:56:05 +03:00
Laurent Destailleur
b72123e7ec Fix custom code must be visible only for products 2016-07-11 11:43:59 +02:00
Laurent Destailleur
329bdfc9fd FIX We must take last recent price when using several level of prices 2016-07-11 11:35:38 +02:00
Laurent Destailleur
d5f221452e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-11 11:34:28 +02:00
Laurent Destailleur
0367cee671 FIX We must take the last recent defined price when using price level 2016-07-11 11:34:11 +02:00
Laurent Destailleur
7e000d4ce2 Fix missing css opacitymedium 2016-07-11 10:46:44 +02:00
Laurent Destailleur
1efedbdade Fix badge on project tab 2016-07-11 10:37:43 +02:00
Laurent Destailleur
2e372ced1e Fix missing fields 2016-07-11 10:28:57 +02:00
Laurent Destailleur
1f7bc1d518 FIX Bad sort link on ECM module for automatic tab 2016-07-11 02:06:46 +02:00
Laurent Destailleur
914d56bb1b Fix css for last chrome versions. max-width: 0 fails on box 2016-07-09 16:54:04 +02:00
Laurent Destailleur
db7f7a420b Fix loading language 2016-07-09 16:12:35 +02:00
Laurent Destailleur
c6ab11a9e5 Fix translation 2016-07-09 15:44:03 +02:00
Laurent Destailleur
2ec7d47869 Fix css 2016-07-09 15:35:49 +02:00
Laurent Destailleur
bfb48ecce9 Where is the info tab of project ? 2016-07-09 15:30:42 +02:00
Laurent Destailleur
a258663175 Fix edition of status were loosing old percent. We show it to allow user 
to keep it if required.
 2016-07-09 14:58:51 +02:00
Marcos García de La Fuente
d01796a214 FIX #5470 User of expense report in bank transactions page is not correct 2016-07-09 14:31:41 +02:00
Laurent Destailleur
03dbf6e747 Fix edit of progess only 2016-07-09 14:28:33 +02:00
Laurent Destailleur
0e4dcb301c Fix several bugs into projects 2016-07-09 13:58:46 +02:00
Laurent Destailleur
8504e09e72 Fix permission to enter time spent 2016-07-09 12:35:12 +02:00
Laurent Destailleur
e228d8e549 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-09 12:09:35 +02:00
Laurent Destailleur
93c9e81c33 Fix better size on list 2016-07-09 12:05:09 +02:00
Laurent Destailleur
47d7ac8031 Fix the repair tool to correct corrupted stock for batch numbers 2016-07-08 23:11:55 +02:00
Laurent Destailleur
a48c79b68b Fix corrupted stock 2016-07-08 23:02:25 +02:00
Laurent Destailleur
0f23cef46c Fix warning of the repair tool. 2016-07-08 18:59:36 +02:00
philippe grand
bc5b9bd8a2 internationalization of code comment 2016-07-08 18:24:55 +02:00
Laurent Destailleur
d8d938e82c Fix performance problems Enter new time spent duration becoma < 1s 
instead of 30s with 5000 tasks.
 2016-07-08 17:06:12 +02:00
Laurent Destailleur
298c55b3ed Fix bad property set. Must set fk_task_parent not fk_parent. 2016-07-08 16:22:16 +02:00
Laurent Destailleur
a95335d869 Fix missing ref of task 2016-07-08 16:20:11 +02:00
Laurent Destailleur
999341c1a2 Better performance 2016-07-08 12:02:09 +02:00
Laurent Destailleur
d940cc392a FIX Several fix to exclude WON/LOST of reporting of opportunities amount 
(sometimes we need, sometimes not).
 2016-07-08 10:59:13 +02:00
appchecker
2c297bbcc8 prevent SQLi 2016-07-07 20:25:15 +03:00
appchecker
9895084627 prevent SQLi 2016-07-07 20:23:38 +03:00
appchecker
931089a924 prevent SQLi 2016-07-07 20:19:05 +03:00
Laurent Destailleur
f911450017 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-07 18:56:39 +02:00
Laurent Destailleur
fec2d86ec5 Fix substitution of __THIRDPARTY_NAME__ failed 2016-07-07 18:56:10 +02:00
Juanjo Menent
9c63a7497d Merge pull request #5461 from mrsof/patch-1 
FIX: Missing semicolon
 2016-07-07 17:23:59 +02:00
Juanjo Menent
043ff934fb Merge pull request #5459 from atm-florian/fix_syntax 
fix syntax 'year' instead of '$year'
 2016-07-07 17:22:15 +02:00
Juanjo Menent
df16aaea0c Merge pull request #5460 from atm-florian/fix_bug_introduceby_97eedb8 
FIX : warning on urlencode into main.inc.php
 2016-07-07 17:21:57 +02:00
Laurent Destailleur
9192587ef2 Fix duplicate records 2016-07-07 16:57:57 +02:00
Laurent Destailleur
5ebbe02853 Fix missing trackid into parameters of hooks 2016-07-07 16:26:00 +02:00
Laurent Destailleur
56e374ff0d Fix remove warnings 2016-07-07 15:41:11 +02:00
Laurent Destailleur
24a798ed2f Fix restore translation for ModuleCompanyCode... 2016-07-07 14:13:33 +02:00
Laurent Destailleur
3566c3fd6e Fix bad link 2016-07-07 11:31:07 +02:00
Laurent Destailleur
3c6c509358 Fix compatibility with old behaviour (direct open of card after a 
search)
 2016-07-07 10:26:40 +02:00
Sof
9b5bcc6dcd FIX: Missing semicolon 2016-07-07 10:25:17 +02:00
Laurent Destailleur
2af7a8c584 Transifex sync 2016-07-07 10:06:35 +02:00
florian HENRY
96172a5910 better syntax 2016-07-07 09:49:27 +02:00
florian HENRY
240dcc78fb fix php warning introduce by 97eedb866b 
urlencode cannot deal with array
 2016-07-07 09:47:12 +02:00
florian HENRY
1957af52b1 fix syntax 2016-07-07 09:23:43 +02:00
Laurent Destailleur
63ad970a27 Sync transifex 2016-07-07 04:26:22 +02:00
Laurent Destailleur
804159f3f3 Fix language files 2016-07-07 04:11:27 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
b2d4fb94d6 Fix wrapping of left menu for menu titles 2016-07-07 00:34:59 +02:00
Laurent Destailleur
d7bc30fc4e Prepare DoliWamp 4.0 2016-07-06 23:18:01 +02:00
Laurent Destailleur
d22ef4f371 Fix Do not show status 2016-07-06 22:35:12 +02:00
Regis Houssin
4503659cba Fix: wrong multicompany filter 2016-07-06 16:50:10 +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
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
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
c24d68a038 Picto for expense report 2016-07-03 21:14:45 +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
e9797538b3 Merge pull request #5432 from atm-florian/3.9 
FIX #4926
 2016-07-02 20:31:58 +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
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
Laurent Destailleur
7d9671f6d3 Fix bad separator in url 2016-07-02 11:44:46 +02:00
Laurent Destailleur
3eaf0bc4bf Fix bad translation 2016-07-02 11:32:06 +02:00
Laurent Destailleur
76d24ac8ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3 Fix NNE has been replaced with ICS 2016-07-02 11:26:55 +02:00
Frédéric FRANCE
0639bafa6b Update list.php 2016-07-02 10:19:38 +02:00
Laurent Destailleur
c8c51dd96d Fix clone of intervention was not cloning lines. 2016-07-01 19:15:30 +02:00
Laurent Destailleur
02e35f8c76 Fix where is the clone of intervention ? 2016-07-01 18:16:26 +02:00
Laurent Destailleur
0e7889a68c Fix must show label of leave type and not id. 2016-07-01 17:53:16 +02:00
Laurent Destailleur
59f86a12d2 Fix delete of documents generated on project. 
Fix missin translation
 2016-07-01 17:49:13 +02:00
Laurent Destailleur
e557502504 Fix save of stock limit failed 2016-07-01 17:34:49 +02:00
arnaud
cf5de9d0c8 FIX form_confirm to delete payment on supplier invoice 2016-07-01 16:59:03 +02:00
arnaud
09b824d819 FIX product stats all bloc module without enbaled test 2016-07-01 16:44:05 +02:00
florian HENRY
2520ee921a llx_ecm_directories 2016-07-01 08:37:24 +02:00
florian HENRY
08fbc21bb1 llx_ecm_directories 2016-07-01 08:36:20 +02:00
florian HENRY
7118c8b39b Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-07-01 08:34:10 +02:00
florian HENRY
bfcc72b8d8 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-07-01 08:33:45 +02:00
Laurent Destailleur
b12bd9b070 Merge remote-tracking branch 'origin/3.9' into develop 2016-07-01 03:51:59 +02:00
Laurent Destailleur
45767b9b6b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-01 03:51:45 +02:00
Laurent Destailleur
f8b1d0d7ca Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-01 03:51:23 +02:00
Laurent Destailleur
38d6438bd5 Merge pull request #5417 from atm-florian/dev_fix5416 
FIX :#5416
 2016-07-01 03:45:38 +02:00
Laurent Destailleur
15e79cf089 Merge pull request #5411 from atm-alexis/FIX_develop_compatibility 
FIX old method add have to return create method result
 2016-07-01 03:44:18 +02:00
Laurent Destailleur
07fd911770 Merge pull request #5401 from atm-alexis/FIX_3.8_bug_5383 
# FIX #5383 bad object id on don delete
 2016-07-01 03:42:59 +02:00
Laurent Destailleur
2c5e1c17fe Fix hard coded table prefix 2016-07-01 03:42:19 +02:00
Laurent Destailleur
62d7303d8f Add comment 2016-07-01 03:40:48 +02:00
Laurent Destailleur
74378e2c65 Merge pull request #5407 from atm-alexis/FIX_3.8_bug_5338 
FIX #5338 use of not initialized var $aphour, $apmin, etc
 2016-07-01 03:27:26 +02:00
Laurent Destailleur
5713d293e3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-01 03:22:16 +02:00
Laurent Destailleur
625213580c Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-07-01 03:17:20 +02:00
Laurent Destailleur
9e82a8b4e6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-01 03:12:02 +02:00
Laurent Destailleur
102179028c FIX #5414 2016-07-01 03:11:41 +02:00
Laurent Destailleur
3645bd8f69 Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170 
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
 2016-07-01 03:06:31 +02:00
Laurent Destailleur
1d0e14be62 Merge pull request #5423 from atm-alexis/FIX_3.9_bug_4964 
FIX #4964 buyprice in customer from shipping
 2016-07-01 02:52:15 +02:00
Laurent Destailleur
6066b711af Merge pull request #5427 from atm-geoffrey/FIX_project_select_on_event 
Fix #4828
 2016-07-01 02:47:43 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
 2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/sendings.lib.php
 2016-07-01 02:06:30 +02:00
Laurent Destailleur
c9300bae35 Merge pull request #5415 from fmarcet/3.8 
Fix: Incorrect document link on supplier invoices's list
 2016-06-30 22:31:18 +02:00
Laurent Destailleur
a439661ac7 Merge pull request #5421 from atm-arnaud/fix_5004 
FIX #5004
 2016-06-30 22:23:53 +02:00
Laurent Destailleur
5c11192c7c Merge pull request #5425 from atm-arnaud/fix_4749 
FIX #4749
 2016-06-30 22:20:18 +02:00
Laurent Destailleur
f3821c30f3 Merge pull request #5412 from atm-florian/dev_compta 
Dev compta
 2016-06-30 21:58:45 +02:00
Laurent Destailleur
d4226a038e Merge pull request #5418 from atm-maxime/fix_time_spent_right 
FIX #5319
 2016-06-30 21:56:25 +02:00
Laurent Destailleur
3ddd56a326 Merge pull request #5410 from frederic34/patch-8 
FIX Bad link on supplier orders area
 2016-06-30 21:40:45 +02:00
Laurent Destailleur
f2bb51ad02 Merge pull request #5406 from atm-gauthier/3.8_fix_linked_receiving 
FIX : receiving link never works
 2016-06-30 21:38:29 +02:00
Laurent Destailleur
03c420b34e Merge pull request #5403 from atm-florian/dev_fixwarning 
Fix box PHP strict warning
 2016-06-30 21:34:26 +02:00
Laurent Destailleur
578a58527f Merge pull request #5430 from atm-arnaud/fix_4455 
FIX #4455
 2016-06-30 21:32:17 +02:00
Laurent Destailleur
db0b806c7b Merge pull request #5434 from atm-florian/dev_fix4672 
Dev fix4672
 2016-06-30 21:00:48 +02:00
Laurent Destailleur
4023da5a3f Merge pull request #5435 from atm-florian/dev_fix4793 
Cannot reproduce 4793 still fix other bug on PgSQL
 2016-06-30 20:58:27 +02:00
Laurent Destailleur
ae1fd5bbb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-30 19:35:49 +02:00
Laurent Destailleur
3611161b67 Fix custom code should not appears on services 2016-06-30 19:35:11 +02:00
florian HENRY
215f397f33 Cannot reproduce 4793 still fix other bug on PgSQL 2016-06-30 17:28:13 +02:00
florian HENRY
37ee64ae9b fix 4672 2016-06-30 17:10:06 +02:00
Maxime Kohlhaas
d004f3a538 FIX #4448 $filebonprev is not used, $this->filename now 2016-06-30 17:03:56 +02:00
florian HENRY
855550e274 FIX 4926 2016-06-30 17:00:09 +02:00
florian HENRY
8097298c80 FIX #4756 2016-06-30 16:55:59 +02:00
arnaud
38dcb0de49 FIX #4455 2016-06-30 16:53:24 +02:00
florian HENRY
388bd5ca48 code review 2016-06-30 16:42:49 +02:00
Maxime Kohlhaas
aa67a29115 FIX #4383 $userid not defined 2016-06-30 16:40:38 +02:00
atm-geoffrey
75bb161930 FIX #4828 2016-06-30 16:20:53 +02:00
arnaud
0ffe106e2c FIX #4749 2016-06-30 16:03:48 +02:00
Alexis Algoud
02169478d0 FIX #4964 buyprice in customer from shipping 
buyprice wasn't load in expedition::fetch_lines
 2016-06-30 15:30:07 +02:00
Alexis Algoud
fa73dbe8e9 FIX #5128 if create method return duplicated code error 
not use GETPOST in order to get a new code
 2016-06-30 15:12:35 +02:00
arnaud
97fe75f198 FIX #5004 2016-06-30 14:57:23 +02:00
Alexis Algoud
22bc44620b FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option 2016-06-30 14:27:58 +02:00
florian HENRY
542be965b3 add log and toher multicurrency bug fix for PgSQL 2016-06-30 14:24:55 +02:00
Maxime Kohlhaas
c73c1a577a Time spent can be saved with project read right 2016-06-30 14:24:03 +02:00
florian HENRY
1740166d28 FIX :#5416 2016-06-30 14:16:41 +02:00
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00
Laurent Destailleur
5950178c7a Fix create of admin user 2016-06-30 00:38:13 +02:00
Laurent Destailleur
0be23553a4 Fix menu closing 2016-06-29 19:43:42 +02:00
Laurent Destailleur
f7427e7366 Fix css 2016-06-29 18:15:35 +02:00
Laurent Destailleur
e8b4a3a8ae Code comment 2016-06-29 17:34:13 +02:00
florian HENRY
34fddbf3bc addd export cogilog 2016-06-29 17:30:47 +02:00
Laurent Destailleur
d1850be261 Fix conflict in leftmenu value for projet menu 2016-06-29 17:00:05 +02:00
florian HENRY
9b044ec5ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_compta 2016-06-29 16:55:59 +02:00
florian HENRY
ea3e851ec0 Fix stuff in accoutancy 2016-06-29 16:54:37 +02:00
Alexis Algoud
a55a166df3 FIX old method add have to return create method result for backward compatibility 2016-06-29 16:30:47 +02:00
Frédéric FRANCE
76a113257e Update index.php 2016-06-29 16:16:56 +02:00
Laurent Destailleur
5f5328c3d8 FIX Link in menu when using left menu editor was wrong. 
FIX Updating an entry with menu editor did not save fk_leftmenu.
 2016-06-29 14:09:18 +02:00
Laurent Destailleur
ab444af8c2 Fix bad css 2016-06-29 13:38:19 +02:00
Laurent Destailleur
933ec6c118 FIX detection of HTML content when only p tag is present. 2016-06-29 13:14:53 +02:00
Laurent Destailleur
dcfc385645 Fix to avoid blocking error in auto upgrade process 2016-06-29 12:26:01 +02:00
Laurent Destailleur
1e9cee1b07 Fix bug reported by scrutinizer 2016-06-29 11:48:28 +02:00
Laurent Destailleur
8bcd2e581f Fix of bugs reported by scrutinizer 2016-06-29 11:20:48 +02:00
florian HENRY
dfc4f3e7fe on going accountacy working 2016-06-29 11:06:02 +02:00
Laurent Destailleur
4708f0114c Clean code 2016-06-29 10:05:05 +02:00
Laurent Destailleur
6c0f842843 Missing translation 2016-06-28 17:53:59 +02:00
Laurent Destailleur
2c97d0855a Fix: On template invoice, edition of line was not complete. 2016-06-28 17:51:29 +02:00
Alexis Algoud
7e8506e25f FIX #5338 use of not initialized var $aphour, $apmin, etc 2016-06-28 13:25:47 +02:00
gauthier
d9035e5308 FIX : receiving link never works 2016-06-28 11:41:23 +02:00
florian HENRY
1fdd434528 fix travis 2016-06-28 09:52:27 +02:00
Laurent Destailleur
9b1caefbf9 Fix bad var 2016-06-28 02:40:42 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +02:00
Laurent Destailleur
5aa561598f Fix exit into functions 2016-06-28 02:22:01 +02:00
Laurent Destailleur
7d2d38d7b5 Maj trad 2016-06-27 16:16:28 +02:00
Laurent Destailleur
9ec31aea0a Use a more common translation 2016-06-27 15:28:19 +02:00
florian HENRY
d0be7877d3 Fix box PHP strict warning 2016-06-27 13:57:10 +02:00
Alexis Algoud
eb9d26a9e0 FIX #5383 bad object id on don delete 2016-06-27 11:36:13 +02:00
Laurent Destailleur
d6e15fe8f3 Increase max size of number of product into list 2016-06-26 23:15:20 +02:00
Laurent Destailleur
bc38bc63ca Fix minor bug in direct printing with google cloud print 2016-06-26 21:18:44 +02:00
Laurent Destailleur
8878c73732 Fix: link to other elements must be at end everywhere 2016-06-26 12:07:24 +02:00
Laurent Destailleur
d23a8a56ea Fix must use the constant, not hard coded value. 2016-06-25 21:40:45 +02:00
Laurent Destailleur
09a868af3f FIX: Sync of password must follow same rule 'crypted or not' on both 
sides (user and member)
 2016-06-25 21:28:52 +02:00
Laurent Destailleur
f021a8ca31 FIX Bad error management into trigger of mailmanspip 2016-06-25 18:48:50 +02:00
Laurent Destailleur
a8ba8e612a Missing translation 2016-06-25 15:56:03 +02:00
Laurent Destailleur
9fb4df2ef8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-25 15:27:26 +02:00
Laurent Destailleur
5898fdb813 A more complete example 2016-06-25 15:27:16 +02:00
Laurent Destailleur
413409737b Merge pull request #5400 from frederic34/patch-8 
typo
 2016-06-25 15:18:35 +02:00
Laurent Destailleur
266fef40ad Add a way to enhance security check. 2016-06-25 15:16:32 +02:00
Laurent Destailleur
945fcc7586 FIX Better support of GROUP_CONCAT for postgresql 2016-06-25 14:38:10 +02:00
Laurent Destailleur
f090100790 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-25 14:20:34 +02:00
Laurent Destailleur
5222b78e95 FIX property of bank account were lost if an error occured during 
saving.
 2016-06-25 14:20:23 +02:00
Frédéric FRANCE
7004dfbc15 typo 2016-06-25 09:57:46 +02:00
Laurent Destailleur
4856010400 Try to fix the group_concat function for pgsql. 2016-06-25 02:30:12 +02:00
Laurent Destailleur
9ebf7a1e35 Try to fix the group_concat function for pgsql. 2016-06-25 02:21:54 +02:00
Laurent Destailleur
b6700c70d6 Merge pull request #5399 from atm-geoffrey/fix_PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS 
FIX Hide a non relevant message when PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is on on project edit view
 2016-06-24 21:54:36 +02:00
Laurent Destailleur
aa1207d77a Merge pull request #5398 from atm-geoffrey/fix_project_clone_extrafields 
FIX extrafields cloned on project clone
 2016-06-24 21:53:02 +02:00
Laurent Destailleur
1368e6d462 Fix: error message was not enough to understand 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b Fix: error message was not enough to understand 2016-06-24 17:04:59 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several 
tabs are opened on form to send emails.
 2016-06-24 16:10:52 +02:00
geoffrey.girard
321ccce438 Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS on project edit view 2016-06-24 15:57:08 +02:00
Laurent Destailleur
6033b09344 FIX: A constructor must not return a value. 
FIX: A topic is required to send an email (probability to be spam of
99%)
 2016-06-24 15:36:20 +02:00
geoffrey.girard
0a5ded20a3 FIX extrafield cloned on project clone 2016-06-24 15:27:47 +02:00
Laurent Destailleur
0bf0937cc6 FIX: disabled templates must be not visible. 2016-06-24 13:08:34 +02:00
Laurent Destailleur
e144df759c FIX forced bank account was lost on proposal 
Fix Invoice was using duplicated bugged code for pdf removal link.
 2016-06-24 12:50:50 +02:00
Laurent Destailleur
e8eee05962 Cleaner css 2016-06-24 03:05:51 +02:00
Laurent Destailleur
3b38e5a870 FIX Withdraw request should not be possible if amount is negative. 2016-06-24 03:00:34 +02:00
Laurent Destailleur
453c6264bf FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly 2016-06-24 02:19:41 +02:00
Laurent Destailleur
eddab57f32 Minor css fix 2016-06-24 01:00:37 +02:00
Laurent Destailleur
227bdb9838 FIX extrafields was not visible on tab "subscription" 
FIX Link between membership and invoice was not saved
 2016-06-24 00:45:35 +02:00
Laurent Destailleur
d72d22cda4 Fix confusing translation 2016-06-23 23:22:30 +02:00
Laurent Destailleur
2e4c6597d8 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:05:00 +02:00
Laurent Destailleur
f6119cfee8 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:03:08 +02:00
Laurent Destailleur
d78eb4495e Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-06-23 20:55:31 +02:00
Laurent Destailleur
9b50150fe8 FIX #5380 2016-06-23 20:54:04 +02:00
Laurent Destailleur
79c3f9f8cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-23 20:50:48 +02:00
Laurent Destailleur
2988a38786 Merge pull request #5392 from hregis/develop_origin 
Fix: missing rename field "shortname" to "ref"
 2016-06-23 20:24:20 +02:00
Laurent Destailleur
05cbf37aca Merge pull request #5387 from frederic34/patch-8 
FIX Using parm instead of this in function pdfGetHeightForHtmlContent
 2016-06-23 20:22:17 +02:00
Laurent Destailleur
f8e9ec7ce9 Merge pull request #5395 from grandoc/develop 
internationalization of code comment
 2016-06-23 20:20:28 +02:00
Laurent Destailleur
91e13d23fe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-23 20:20:16 +02:00
Scrutinizer Auto-Fixer
23620e3133 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-06-23 18:19:43 +00:00
Laurent Destailleur
2223ec15d1 Fix doxygen errors 2016-06-23 20:19:35 +02:00
philippe grand
0c5eaddf7a internationalization of code comment 2016-06-23 19:56:17 +02:00
Regis Houssin
25631b236b Fix: missing rename field "shortname" to "ref" 2016-06-23 16:47:21 +02:00
florian HENRY
c67fa41298 FIX : Translate group perms as it is done into user perms 2016-06-23 16:29:06 +02:00
Frédéric FRANCE
3690d11ca2 Update pdf.lib.php 2016-06-23 10:48:52 +02:00
Laurent Destailleur
d0f03d9ff6 Merge pull request #5376 from atm-florian/develop 
FIX php warning method declaration
 2016-06-23 10:02:13 +02:00
Laurent Destailleur
7f0ed90652 Merge pull request #5385 from simnandez/3.9 
FIX: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
 2016-06-23 10:01:34 +02:00
Laurent Destailleur
0662be0638 Merge pull request #5381 from grandoc/develop 
internationalization of code comment
 2016-06-23 10:01:00 +02:00
Laurent Destailleur
6cedec2d63 Merge pull request #5384 from frederic34/patch-8 
Update mysqli.class.php
 2016-06-23 09:57:36 +02:00
Laurent Destailleur
4a408e76e7 Fix download of mass generated files. 2016-06-22 21:06:08 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
 2016-06-22 20:22:22 +02:00
Laurent Destailleur
7f0062cb4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-22 20:09:31 +02:00
Laurent Destailleur
7fbbf7e8f0 Fix translation missing 2016-06-22 20:09:20 +02:00
Laurent Destailleur
f514400d87 FIX a case of corrupted ODT by Word that insert <text:s> when it should 
not.
 2016-06-22 20:08:29 +02:00
Juanjo Menent
0d62bd704e Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated 2016-06-22 18:59:51 +02:00
Laurent Destailleur
7ea16ac3fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/theme/md/style.css.php
 2016-06-22 15:31:56 +02:00
Laurent Destailleur
f72ff5ac93 FIX Responsive errors due to boxes 2016-06-22 15:23:48 +02:00
florian HENRY
dfba0638ab continue accoutancy and PG SQL compatibility 2016-06-22 11:28:21 +02:00
Frédéric FRANCE
375ce04076 Update mysqli.class.php 2016-06-22 09:53:02 +02:00
florian HENRY
e897700bb2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-06-22 08:41:35 +02:00
philippe grand
cc4fe87e13 internationalization of code comment 2016-06-21 17:00:52 +02:00
Laurent Destailleur
52f414ad73 Fix selection of visible fields on customer and supplier lists. Filters 
are ok now. Order of list of fields in selection is same than in output
array.
 2016-06-21 15:16:33 +02:00
Laurent Destailleur
b953e8f364 Minor fix 2016-06-21 12:15:41 +02:00
Laurent Destailleur
73fb7b2615 Fix phpunit regression. phpunit test on ws invoice is cleaner. 2016-06-21 01:07:44 +02:00
florian HENRY
c34ef410e8 FIX php warning method declaration 2016-06-20 15:50:00 +02:00
Laurent Destailleur
6317cb53f2 FIX Merge of 2 thirdparties when there is one common tag. 2016-06-20 15:42:16 +02:00
Laurent Destailleur
b62be8dd0b Fix: Test table llx_expedition to allow delete of thirdparty 2016-06-20 14:17:17 +02:00
Laurent Destailleur
195fcc5653 Minor fixes 2016-06-20 11:43:53 +02:00
Laurent Destailleur
b01eed697e Fix sort on thirdparty on bank transaction list 2016-06-20 11:30:43 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
8356dd1080 Fix minor 2016-06-20 10:22:08 +02:00
Laurent Destailleur
6cfc585205 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-20 03:21:55 +02:00
Laurent Destailleur
febf56e28c Sync transifex 2016-06-20 03:21:35 +02:00
Laurent Destailleur
7f4e163a52 Fix scrutinizer reports 2016-06-20 02:37:02 +02:00
Laurent Destailleur
a4d4cb2a4a Merge pull request #5373 from grandoc/develop 
internationalization of code comment
 2016-06-20 02:14:26 +02:00
Laurent Destailleur
2223d283dc Sync transifex 2016-06-20 00:45:25 +02:00
Laurent Destailleur
74f19944b9 Fix rtl language ar_SA 2016-06-20 00:13:30 +02:00
Laurent Destailleur
386b19d4b1 Fix regression. Add hidden option PROPAL_DISABLE_SIGNATURE to restore 
old behaviour.
 2016-06-19 17:56:34 +02:00
philippe grand
0cc990402e internationalization of code comment 2016-06-19 17:39:40 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
e29d46f421 Better position of version 2016-06-19 13:18:21 +02:00
Laurent Destailleur
eac5cbb0dd FIX Fix the reposition on the clear target button. 2016-06-19 11:59:55 +02:00
Laurent Destailleur
0cbfb28a0f FIX using media files in dolfilemanager with spaces inside. 2016-06-19 11:45:13 +02:00
Laurent Destailleur
e08ac03618 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-19 11:19:30 +02:00
Laurent Destailleur
cd122462aa Fix errors on files/dir permissions on dolfilemanager. 2016-06-19 11:19:11 +02:00
Laurent Destailleur
b9982620f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-18 19:49:11 +02:00
Laurent Destailleur
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
Laurent Destailleur
f9509bf345 Merge pull request #5368 from grandoc/develop 
international comment for code
 2016-06-18 18:10:12 +02:00
Laurent Destailleur
4a6427134f Merge pull request #5367 from atm-florian/develop 
FIX bug with PgSQL on GROUP BY missing column
 2016-06-18 18:09:43 +02:00
Laurent Destailleur
f817b562ad Clean language files 2016-06-18 17:17:45 +02:00
Laurent Destailleur
94b7e176a6 Clean language files 2016-06-18 16:46:21 +02:00
Laurent Destailleur
de76f2a9aa Clean language files 2016-06-18 15:50:37 +02:00
Laurent Destailleur
d192438eae Enhance tool to clean language files 2016-06-18 12:50:15 +02:00
philippe grand
e28bac3464 Merge remote-tracking branch 'upstream/develop' into develop 
update from upstream
 2016-06-18 11:59:27 +02:00
philippe grand
cbdb9f9b2a internationalization of code comment 2016-06-18 11:52:41 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
33dc2d5ec3 Sync lang 2016-06-17 19:29:58 +02:00
Laurent Destailleur
988ed3947c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-17 16:28:28 +02:00
Laurent Destailleur
34c741bf0d FIX CSS and responsive behaviour (feature with a menu hider is on on 
smarpthone)
 2016-06-17 16:28:16 +02:00
Laurent Destailleur
243a30e5de Code comment 2016-06-17 15:51:09 +02:00
philippe grand
388cd202aa international comment for code 2016-06-17 14:19:54 +02:00
florian HENRY
93417a08b3 FIX : Add comment because accoutancy cannot work with PgSQL 2016-06-17 13:49:44 +02:00
florian HENRY
d94953c4d7 FIX bug with PgSQL on GROUP BY missing column 2016-06-17 13:33:48 +02:00
Laurent Destailleur
48f30b5ef1 Cleaner menu 2016-06-17 12:39:00 +02:00
Laurent Destailleur
d717757594 Protect against bad value of accurancy to avoid javascript error 2016-06-17 10:40:11 +02:00
Laurent Destailleur
76df7afa85 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-17 10:35:30 +02:00
Laurent Destailleur
a3d53b269f FIX javascript error with german-switzerland language 2016-06-17 10:35:18 +02:00
Laurent Destailleur
19eacba248 Merge pull request #5348 from frederic34/patch-8 
FIX Bad name of table into sql request llx_accountingaccount instead of llx_accounting_account
 2016-06-16 20:35:21 +02:00
Laurent Destailleur
4ceba62116 Merge pull request #5320 from novalore/develop 
fixes and typos in en_US lang files
 2016-06-16 20:27:00 +02:00
Laurent Destailleur
4c29e87a78 Merge pull request #5318 from BoboTiG/develop 
Fix status icon of unpaid invoices box
 2016-06-16 20:25:25 +02:00
Laurent Destailleur
c9d743ac26 Merge pull request #5330 from atm-alexis/FIX_large_expense_note_and_large_logo 
FIX 3.8 large expense note
 2016-06-16 20:24:39 +02:00
Laurent Destailleur
e4923fa18a Merge pull request #5346 from damirugrin/develop 
Conflict with ModSecurity solved in facture.php.
 2016-06-16 20:21:24 +02:00
Laurent Destailleur
b4384c13e1 Merge pull request #5349 from atm-maxime/3.9 
FIX #5343
 2016-06-16 20:19:08 +02:00
Frédéric FRANCE
bc22f39aa4 Update import.php 2016-06-16 20:18:58 +02:00
Laurent Destailleur
8e8b14af78 Merge pull request #5347 from olsesacl/develop-fix-install 
Fix: install with mysql 5.7.9
 2016-06-16 20:11:56 +02:00
Laurent Destailleur
252ca09717 Merge pull request #5358 from ndrosis/patch-24 
Greece VAT 23 -> 24
 2016-06-16 20:09:11 +02:00
Laurent Destailleur
a1c2f35ebb Merge pull request #5357 from ndrosis/patch-23 
New TVA for Greece 24%
 2016-06-16 20:08:16 +02:00
Laurent Destailleur
84e13c153d Merge pull request #5354 from atm-maxime/fix_travis 
FIX PHP 5.3 compatibility
 2016-06-16 20:07:59 +02:00
Laurent Destailleur
f45fcc93b7 Merge pull request #5360 from GPCsolutions/5350 
Fix #5350 date_pointoftax prevented creating invoices
 2016-06-16 20:06:52 +02:00
Alexis Algoud
25fe110a34 FIX a task without project inclusion call a non included object Link 2016-06-16 14:08:14 +02:00
Raphaël Doursenaud
eb54c3f8af
Fix #5350 date_pointoftax prevented creating invoices 2016-06-16 13:09:11 +02:00
Drosis Nikos
5a51850d54 Greece VAT 23 -> 24 2016-06-16 14:03:11 +03:00
Laurent Destailleur
f94d140d2a Fix bad sql field name 2016-06-16 13:00:23 +02:00
Drosis Nikos
2ef3d7cedb New TVA for Greece 24% 2016-06-16 13:50:35 +03:00
Laurent Destailleur
9781baa743 FIX Filter on opportunity amount and budget 2016-06-16 12:42:21 +02:00
Laurent Destailleur
49d515be7e Fix debug info was visible 2016-06-16 12:22:55 +02:00
Laurent Destailleur
3720c95a52 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-16 09:50:45 +02:00
Laurent Destailleur
232f525f29 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2016-06-15 18:31:43 +02:00
Maxime Kohlhaas
af5a75c39b Merge branch '3.9' of https://github.com/Dolibarr/dolibarr into 3.9 2016-06-15 18:25:45 +02:00
Laurent Destailleur
630a063283 FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries

Conflicts:
	htdocs/compta/facture.php
 2016-06-15 18:24:15 +02:00
Laurent Destailleur
4c922f073b FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries
 2016-06-15 18:21:58 +02:00
Laurent Destailleur
b5c4bd9b82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-15 17:20:12 +02:00
Laurent Destailleur
2395099d0f Debug Oauth 2016-06-15 17:20:00 +02:00
Maxime Kohlhaas
748b3bb2ba Fix travis error for GETPOST in empty 2016-06-15 14:16:56 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay 
FIX Compatibility datee and date_end for warning of tasks
 2016-06-15 14:05:48 +02:00
Maxime Kohlhaas
f51386c59f FIX #5343 2016-06-15 08:06:22 +02:00
Laurent Destailleur
6711b7fbd1 Fix css entries added when not required 2016-06-14 23:46:07 +02:00
Laurent Destailleur
44503cb43c Fix missing "back to list" link 2016-06-14 20:49:34 +02:00
Frédéric FRANCE
3646b5f5ae Update import.php 2016-06-14 16:04:10 +02:00
Frédéric FRANCE
5234e8fc8f Update index.php 2016-06-14 15:32:55 +02:00
Sergio Sanchis Climent
d9d247e49d Fix install mysql 5.7.9 2016-06-14 00:37:13 +02:00
damirugrin
ec6dd0c42f Update facture.php 2016-06-13 18:48:10 +02:00
damirugrin
c5dcebb58e Conflict with ModSecurity solved. 
When ModSecurity is enabled on apache server then "scandir" is forbidden word. When changing numbering model then you will find following error in apache log: 
ModSecurity: Access denied with code 403 (phase 2). Pattern match "(?i)(?:\\\\b(?:f(?:tp_(?:nb_)?f?(?:ge|pu)t|get(?:s?s|c)|s(?:ession_start|candir)
I have changed "scandir" to "scan_dir".
 2016-06-13 18:13:41 +02:00
Laurent Destailleur
cda17da8b1 Fix security: A password must NEVER be stored as cookie. GETPOST must 
analyse POST only.
 2016-06-12 21:41:16 +02:00
Laurent Destailleur
1396f11b77 css fix 2016-06-12 20:31:38 +02:00
Laurent Destailleur
0602986588 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-12 20:24:23 +02:00
Laurent Destailleur
65cbf1623b Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER 2016-06-12 20:24:05 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
aed2c5cb30 Clean css 2016-06-10 18:41:18 +02:00
Laurent Destailleur
74e59a1bc4 Debug prototype feature "testmenuhider" 2016-06-10 18:41:10 +02:00
Laurent Destailleur
20932a49ca Fix css problem. When width not enough and top menu is wrapped, 
background on menu is still full of top menu color
 2016-06-10 16:59:42 +02:00
Laurent Destailleur
a29b6440e3 Fix order is closed if all shipments are closed. 2016-06-09 22:40:21 +02:00
Laurent Destailleur
ccba65fe74 Clean dead code 2016-06-09 22:30:50 +02:00
Laurent Destailleur
758f5897d3 Fix Missing message to explain record is saved 2016-06-09 21:22:07 +02:00
Laurent Destailleur
2c48391365 No currency into lists 2016-06-09 07:51:56 +02:00
Laurent Destailleur
fd4973c413 Fix missing total 2016-06-09 07:50:54 +02:00
Laurent Destailleur
09270aa8bd Not used table 2016-06-09 07:27:24 +02:00
Laurent Destailleur
8ffe7097a4 Prepare responsive fixes 2016-06-09 01:33:26 +02:00
root
b3d58e9510 FIX large expense note 2016-06-08 14:36:52 +02:00
Laurent Destailleur
8b446faa53 Fix field not sortable 2016-06-08 11:59:48 +02:00
Laurent Destailleur
653387ba95 Fix pagination on movement list 2016-06-08 11:58:37 +02:00
Laurent Destailleur
73d465a8e8 Fix missing use of natural_search 2016-06-08 11:44:00 +02:00
Laurent Destailleur
59c6c90200 Remove a FIXME. 2016-06-08 11:40:50 +02:00
Laurent Destailleur
240c4baba8 FIX filter on stock movement 2016-06-08 11:29:48 +02:00
Laurent Destailleur
f5d7c6fda5 Fix translation of desired stock (this is more clear) 2016-06-08 09:57:03 +02:00
Laurent Destailleur
9dade02dba Fix missing test on $error 2016-06-07 20:52:43 +02:00
Laurent Destailleur
f552f3a7d5 Fix missing $notrigger on product delete 2016-06-07 20:51:06 +02:00
Laurent Destailleur
544b123bdd Fix can edit condition and mode of payment even if not draft. 2016-06-07 20:25:45 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
ad001ed4dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-07 14:06:17 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
c7065cc3b8 Minor esthetic fixes 2016-06-07 13:15:38 +02:00
novalore
54fbd2b23a fixes and typos in en_US lang files 2016-06-07 12:48:47 +02:00
BoboTiG
2f8915947f Add GROUP BY to be SQL standart compliant 2016-06-07 10:16:20 +02:00
Laurent Destailleur
18f1ee1685 Merge pull request #5316 from atm-gauthier/develop_fix_deplacement_list 
FIX : if user is only allowed to see his companies, he must be allowe…
 2016-06-07 00:43:17 +02:00
Laurent Destailleur
dcc1589d7c Merge pull request #5312 from aspangaro/4.0-p32 
Loan - Debug & update
 2016-06-07 00:28:20 +02:00
Laurent Destailleur
a8541fcaeb Merge pull request #5315 from atm-gauthier/develop_fix_usercard_link_on_deplacement 
FIX : wrong id user deplacement links
 2016-06-07 00:27:08 +02:00
Laurent Destailleur
645412517d css enhancement 2016-06-06 22:07:35 +02:00
Laurent Destailleur
cc8db0d0df FIX #2605 Request 4 - Missing last supplier proposal on thirdparty card. 2016-06-06 21:26:31 +02:00
aspangaro
a6a96c710d Restore note page 2016-06-06 20:36:04 +02:00
BoboTiG
616ede1643 Unpayed invoices box: fix status icon 2016-06-06 19:05:24 +02:00
Laurent Destailleur
2918dcfde4 Fix missing include 2016-06-06 17:25:44 +02:00
Laurent Destailleur
92da0cfe38 Fix text sticked on picto. 2016-06-06 17:21:18 +02:00
Laurent Destailleur
29fab54578 Fix box of last contracted contract (contract ref was not visible, label 
was wrong).
 2016-06-06 17:18:31 +02:00
Laurent Destailleur
559c1aa010 Fix alignetment of title in some arrays 2016-06-06 16:37:18 +02:00
Laurent Destailleur
fb13225173 Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
gauthier
07d07d522a FIX : if user is only allowed to see his companies, he must be allowed to see deplacement which are not linked to a company 2016-06-06 16:31:42 +02:00
gauthier
b153ae8c6b FIX : wrong id user deplacement links 2016-06-06 16:12:27 +02:00
Laurent Destailleur
473ab18306 Fix link on workboard 
Fix warning picto is missing on task list
 2016-06-06 15:48:41 +02:00
Laurent Destailleur
0e06f116a2 Fix truncation of event conente in agenda view 2016-06-06 15:13:55 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
4416925a85 Merge pull request #5314 from fmarcet/peru 
Fix: Missing userid on query
 2016-06-06 13:40:20 +02:00
Laurent Destailleur
293534273f Merge pull request #5313 from aspangaro/4.0-p33 
Fix: colspan in vat list of payments
 2016-06-06 13:39:07 +02:00
Laurent Destailleur
788c20516c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-06 13:37:59 +02:00
Laurent Destailleur
06b1336ba9 Merge pull request #5310 from aspangaro/4.0-p31 
Fix: Accountancy - Right to access to fiscal year
 2016-06-06 13:37:00 +02:00
Laurent Destailleur
1f93425193 Merge pull request #5308 from atm-maxime/develop 
FIX #5044
 2016-06-06 13:35:59 +02:00
Laurent Destailleur
e10db62b3a Fix a deadlock situation. If order set to billed by error, no way to 
solve situation.
 2016-06-06 13:29:37 +02:00
Laurent Destailleur
52fefc2d02 Debug module resource 2016-06-06 13:14:05 +02:00
Laurent Destailleur
9b6e5196ea Debug module resource. Filter on agenda. 2016-06-06 13:05:36 +02:00
Laurent Destailleur
681249de8a Debug module resource 2016-06-06 12:29:15 +02:00
Your Name
68fa27ec03 Fix: Missing userid on query 2016-06-06 12:00:24 +02:00
Maxime Kohlhaas
fdfcc064dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2016-06-06 11:53:53 +02:00
Laurent Destailleur
9c88eadbe4 Fix: button to generate invoice manually must be disabled if we reach 
max number of generation.
 2016-06-06 11:48:39 +02:00
Laurent Destailleur
a0458be943 Fix object not defined 2016-06-06 11:25:54 +02:00
Laurent Destailleur
9eee61e6b7 Fix trans 2016-06-06 11:13:19 +02:00
Laurent Destailleur
51ce4804dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-06 10:58:43 +02:00
Laurent Destailleur
ff23c825ae Code comment 2016-06-06 10:58:23 +02:00
aspangaro
e911b32b83 Fix: Loan - Totalpaid (Only the capital is deducted from the amount of loan to be paid off) 2016-06-05 16:15:04 +02:00
aspangaro
bfb212f61a Fix: Loan - Add dol_fiche 2016-06-05 16:08:40 +02:00
aspangaro
3b3567a718 Fix: colspan 2016-06-05 15:50:32 +02:00
aspangaro
bc92818c1a New: Loan - Show accounting account in card in view mode 2016-06-05 15:39:41 +02:00
aspangaro
fda07997d2 Fix: Loan - Remove page note, already present in card 2016-06-05 15:25:21 +02:00
aspangaro
1d5dd0d16e New: Loan - Add accountancy account list 2016-06-05 15:21:11 +02:00
aspangaro
23b748aca3 Fix: Accountancy - Access rights 2016-06-05 14:22:13 +02:00
aspangaro
466010a412 Fix: Accountancy 4.0 - Right to access to fiscal year 2016-06-05 14:14:20 +02:00
Maxime Kohlhaas
caaffdb0c3 FIX #5044 2016-06-05 02:54:25 +02:00
novalore
b52c441c64 english fix in accountancy for currency 2016-06-05 02:26:10 +02:00
Laurent Destailleur
248ac67af2 Fix php test 2016-06-05 02:24:31 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Maxime Kohlhaas
0ab4827091 FIX #5087 2016-06-05 02:06:32 +02:00
Laurent Destailleur
c07933729a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-05 00:29:40 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
a5472b58d1 FIX #5108 2016-06-05 00:24:00 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:12:34 +02:00
Laurent Destailleur
bbe5e398a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-04 19:36:41 +02:00
Laurent Destailleur
147212437b FIX #4078 Edit inline of label of supplier invoice is ok. 2016-06-04 19:36:28 +02:00
Maxime Kohlhaas
7866fb9dae Fix #5153 2016-06-04 19:11:32 +02:00
Laurent Destailleur
7bc9d980dc Merge pull request #5293 from novalore/develop 
correction on banks.lang as mentioned in #5267
 2016-06-04 19:00:04 +02:00
Laurent Destailleur
5de8eef08d Merge pull request #5300 from defrance/patch-8 
if socity then company requiered
 2016-06-04 18:47:01 +02:00
Maxime Kohlhaas
c3cf72afcc Merge pull request #5296 from aschio/develop 
FIX #5134
 2016-06-04 18:46:33 +02:00
Maxime Kohlhaas
a142588292 Merge pull request #5298 from pselis/develop 
fix #4467
 2016-06-04 18:44:45 +02:00
cla
b440ad4e7b FIX #5134: fixed action 'edit' top page 2016-06-04 18:44:10 +02:00
BENKE Charlie
a193920ddc if socity then company requiered 2016-06-04 18:40:53 +02:00
novalore
c5ed9e723f bills.lang: TIP payment fixed in en_US 2016-06-04 18:39:04 +02:00
Laurent Destailleur
9508de85af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-04 18:37:56 +02:00
Laurent Destailleur
c2e853db41 FIX A non admin user should not be able to set/unset a user as admin 
even if he has right to manage permission
 2016-06-04 18:37:41 +02:00
novalore
d750401eb0 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2016-06-04 18:32:27 +02:00
Maxime Kohlhaas
abe84ef991 Fix rights check on expense reports 2016-06-04 18:32:00 +02:00
paolo
ff95bb1644 fix #4467 2016-06-04 18:31:31 +02:00
cla
9ac05fa8f2 FIX #5134 2016-06-04 18:17:13 +02:00
BENKE Charlie
af8e0802f8 fix : login required not verified on update 2016-06-04 18:15:52 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
novalore
5de8b6eee5 correction on banks.lang as mentioned in #5267 2016-06-04 18:04:49 +02:00
BENKE Charlie
d86f89a8fa fix : #4853 
append if not contact type for the element
 2016-06-04 17:55:28 +02:00
Laurent Destailleur
d1727139f0 Merge pull request #5291 from novalore/develop 
Bug fix: missing string in compta.lang
 2016-06-04 17:50:15 +02:00
Laurent Destailleur
7e7d0fbe37 Merge pull request #5284 from atm-ph/fix_develop_issue_2666 
Fix #2666
 2016-06-04 17:39:31 +02:00
novalore
2d907bc727 miscellaneous lang fixes in en_US 2016-06-04 17:34:23 +02:00
novalore
dcd83c403b Fix #4968 2016-06-04 17:34:04 +02:00
Laurent Destailleur
cff320dbe1 Merge pull request #5289 from tiaris/devcamp2 
FIX  #4173 Ergonomie of product/service card
 2016-06-04 17:32:26 +02:00
phf
a62f5bd5b4 Fix #2777 2016-06-04 17:17:22 +02:00
Juanjo Menent
5da197c517 Merge pull request #5288 from simnandez/develop 
Fix printing following the rules
 2016-06-04 16:41:22 +02:00
jean
49d0c8d5ff FIX #4173 Ergonomie of product/service card 
Add configuration key PRODUCT_NODISPLAYIFNOPHOTO to avoid displaying
nophoto.png
 2016-06-04 16:34:26 +02:00
Juanjo Menent
8f617b196a Fix printing following the rules 2016-06-04 15:51:28 +02:00
jean
918ba71e7f FIX #5014 
if $user is admin and different from $object then nbadmin >=1 is ok when
not in multicompany
 2016-06-04 14:59:43 +02:00
Laurent Destailleur
c59c86e648 Merge branch 'develop' of https://github.com/aschio/dolibarr into 
develop

Conflicts:
	htdocs/fourn/facture/list.php
 2016-06-04 14:55:02 +02:00
Laurent Destailleur
1748da6c56 Merge 2016-06-04 14:51:56 +02:00
phf
8ccda16ef3 Fix call function ldap_connect but not exists 2016-06-04 14:50:32 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
dec1af78c3 Merge pull request #5279 from atm-maxime/fix_dont_delete_order_shipment_link 
Don't delete link between order and shipment
 2016-06-04 14:34:54 +02:00
Laurent Destailleur
1dd9e37b2e Merge pull request #5281 from simnandez/develop 
Fix better perfomance in for
 2016-06-04 14:34:39 +02:00
Laurent Destailleur
054329c319 Merge pull request #5283 from novalore/develop 
en_US lang fixes again
 2016-06-04 14:34:15 +02:00
phf
b3a36688d1 Fix #2666 2016-06-04 14:31:53 +02:00
Laurent Destailleur
674164b71c Add a better explanation on job generation 2016-06-04 14:30:05 +02:00
novalore
d924be8b95 en_US lang fixes again 2016-06-04 14:21:21 +02:00
Laurent Destailleur
22b231e686 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-04 14:11:27 +02:00
Laurent Destailleur
975d9357fa FIX On recurring invoice, when generation is done manually from card, 
counter of number of generation must be +1
 2016-06-04 14:08:57 +02:00
phf
01b881a0a6 Fix builddoc with odt lost value of extrafields as "sellist" on view card 2016-06-04 13:24:42 +02:00
Juanjo Menent
baa6dd84cf Fix better perfomance in for 2016-06-04 13:12:05 +02:00
Maxime Kohlhaas
cc2b2a0baa Don't delete link between order and shipment 2016-06-04 11:52:36 +02:00
Laurent Destailleur
bfb7923d4c Merge pull request #5268 from atm-ph/fix_multicurrency_conf 
Fix conf useful has been commented
 2016-06-04 11:37:01 +02:00
Laurent Destailleur
5a105b75ec Merge pull request #5276 from atm-maxime/fix_import_mapping 
FIX #5229
 2016-06-04 11:35:27 +02:00
Juanjo Menent
8a9dd14ab7 Merge pull request #5278 from novalore/develop 
other fixes in en_US lang files
 2016-06-04 10:08:02 +02:00
Juanjo Menent
43d475aa42 Merge pull request #5272 from simnandez/3.9 
Fix issues with strict mode
 2016-06-04 10:07:01 +02:00
Laurent Destailleur
eb7a4c5ccf FIX Creating a supplier order from proposal order 2016-06-04 02:39:13 +02:00
cla
e1c27216ce FIX #4825 2016-06-04 02:20:11 +02:00
novalore
3ee8f931b4 other fixes in en_US lang files 2016-06-04 02:16:58 +02:00
Laurent Destailleur
c9834117c9 Fix #5156 2016-06-04 02:03:30 +02:00
Laurent Destailleur
32b6766a7d FIX #5195 2016-06-04 01:50:01 +02:00
phf
b000ccf2e2 Fix traduction for multicurrency module 2016-06-04 01:46:10 +02:00
cla
6c126da9a9 FIX #4141 2016-06-04 01:34:04 +02:00
Maxime Kohlhaas
a1c7632a50 Fix import mapping #5229 2016-06-04 01:28:51 +02:00
Laurent Destailleur
ff6daebee6 FIX #5203 2016-06-04 01:19:27 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
phf
495ce2463d Fix switch currency on document do not get the associate rate 2016-06-04 01:13:23 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Laurent Destailleur
609cc1dd70 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-04 00:53:09 +02:00
Laurent Destailleur
9c3365aefc FIX #5163 2016-06-04 00:52:55 +02:00
phf
e3a5af6ad4 Fix clean multicurrency admin 2016-06-04 00:42:01 +02:00
Laurent Destailleur
b51c4ab57b Merge pull request #5275 from novalore/develop 
Miscellaneous typos and errors in en_US lang files
 2016-06-04 00:20:27 +02:00
Laurent Destailleur
1f65ca1961 Merge pull request #5274 from atm-maxime/fix_import_model_type_size4 
Fix import model not correctly saved #5185
 2016-06-04 00:18:32 +02:00
novalore
e2ba9c72a8 French string in main.lang 2016-06-04 00:18:15 +02:00
Laurent Destailleur
5c36aa3802 Merge pull request #5271 from aschio/develop 
FIX #5192
 2016-06-04 00:17:45 +02:00
Maxime Kohlhaas
f2e4fdcce4 Fix import model not correctly saved #5185 2016-06-04 00:16:01 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
Maxime Kohlhaas
8901b99e2d Fix import model not correctly saved #5185 2016-06-04 00:14:08 +02:00
Laurent Destailleur
b47db3e9e1 Merge pull request #5266 from atm-maxime/fix_project_time_spent_access 
Fix access to project task time spent creation #5249
 2016-06-04 00:13:32 +02:00
cla
deb7c407ad FIX #4643 2016-06-04 00:08:13 +02:00
Juanjo Menent
66c73015b2 Fix issues with strict mode 2016-06-03 23:58:54 +02:00
Maxime Kohlhaas
8b0b3b1a9d PMP available only if stock module enabled 2016-06-03 23:49:34 +02:00
cla
18424812db closes #5192. 
I deleted the line and moved last_insert_id() functions 3 lines under
 2016-06-03 23:49:08 +02:00
phf
923952fb25 Fix conf useful has been commented 2016-06-03 23:36:58 +02:00
Maxime Kohlhaas
c9c7045a6f Fix access to project task time spent creation #5249 2016-06-03 23:34:37 +02:00
Laurent Destailleur
4226396da4 Merge pull request #5262 from atm-ph/fix_develop_fetch_extra_link 
Fix using extrafield type "link to object" show error on edit card
 2016-06-03 23:18:24 +02:00
phf
778b05c341 Fix #4632 2016-06-03 23:06:53 +02:00
Laurent Destailleur
149c6916f8 FIX ##5263 2016-06-03 22:20:58 +02:00
Laurent Destailleur
f81a4c56b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-03 22:15:25 +02:00
Laurent Destailleur
fb724566f0 FIX #5252 2016-06-03 22:15:07 +02:00
Laurent Destailleur
448c394f2a Fix date of recurrin invoice 2016-06-03 22:10:33 +02:00
Laurent Destailleur
776118a152 FIX Translation of lithuania 2016-06-03 21:32:12 +02:00
phf
cd79675f7a Fix using extrafield type "link to object" show error on edit card 2016-06-03 21:16:25 +02:00
Laurent Destailleur
6cb6ccf947 Merge pull request #5259 from sbechet/develop 
Regression
 2016-06-03 18:19:31 +02:00
Juanjo Menent
99a28a9dcd Fix Travis error introduced in commit '236ecf01' 2016-06-03 16:15:27 +02:00
Sebastien Bechet
be5eb42a46 Merge remote-tracking branch 'upstream/develop' into develop 2016-06-03 16:15:12 +02:00
Sebastien Bechet
7f98b1ceff Regression 2016-06-03 10:21:37 +02:00
Laurent Destailleur
a5d7c303e7 FIX Button must be out of tabs 2016-06-02 21:11:14 +02:00
Laurent Destailleur
ebd8f2cf86 Prepare 4.0 2016-06-02 13:33:22 +02:00
Maxime Kohlhaas
ab44adc6d5 Fix SQL error on order stats 2016-06-02 12:37:37 +02:00
Laurent Destailleur
f07559a784 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-02 11:44:19 +02:00
Frédéric FRANCE
19f6aa805b select engine for code 128 didn't work 2016-06-02 11:41:26 +02:00
Laurent Destailleur
0f53993c6f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-02 11:24:24 +02:00
Laurent Destailleur
5106f40a56 Merge branch 'develop_NEW_decrease_stock_expedition_classify' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify

Conflicts:
	htdocs/expedition/class/expedition.class.php
 2016-06-02 11:23:49 +02:00
Laurent Destailleur
b8ee75ce23 Merge pull request #5248 from IonAgorria/patch-2 
Fix: Fill ref_supplier in product get_buyprice
 2016-06-02 10:06:17 +02:00
Laurent Destailleur
f40f5e28ad Merge pull request #5254 from atm-florian/3.9_fix5209 
FIX #5209
 2016-06-02 10:05:37 +02:00
Laurent Destailleur
537c9637f6 Merge pull request #5255 from atm-florian/dev_fix5151 
FIX: #5151
 2016-06-02 10:05:02 +02:00
Laurent Destailleur
c663ca13b8 Fix edit left menu 2016-06-01 21:41:47 +02:00
Laurent Destailleur
780d1628a9 Missing trans 2016-06-01 21:19:21 +02:00
Laurent Destailleur
bf5fbd3a80 FIX Infinite loop on menu tree output for edition 
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
 2016-06-01 21:14:28 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
 2016-06-01 17:59:50 +02:00
Laurent Destailleur
ee420b79b1 FIX Infinite loop on menu tree output for edition 
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
 2016-06-01 17:52:06 +02:00
Laurent Destailleur
7519c4a602 FIX Log of tax 
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
 2016-06-01 13:24:27 +02:00
Laurent Destailleur
40005b8f65 FIX Missing search on barcode, only if defined 2016-06-01 12:15:54 +02:00
Florian HENRY
d17a879f33 add into migratino script 2016-05-31 23:32:21 +02:00
Florian HENRY
ed05321438 comment don't need to be updated 2016-05-31 23:24:35 +02:00
Florian HENRY
3c42a32690 FIX: #5151 2016-05-31 23:22:15 +02:00
Florian HENRY
41a41f8931 FIX #5209 2016-05-31 22:55:49 +02:00
Laurent Destailleur
cc68b885a3 Fix minor css errors 2016-05-30 22:39:26 +02:00
Laurent Destailleur
1bc6c4ffa3 Clean code 2016-05-30 20:50:49 +02:00
Laurent Destailleur
0d277083e6 Fix duplicate translation 2016-05-30 19:56:59 +02:00
Laurent Destailleur
58ba5838ce Fix alias name already visible into banner 2016-05-30 19:41:28 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not 
correctly recognised as credit note.
 2016-05-30 19:38:28 +02:00
Laurent Destailleur
89cb122474 Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9 2016-05-30 18:15:19 +02:00
Laurent Destailleur
ed148f70b3 FIX Filter on assigned to was preselected on current user on list "All 
events" (instead of no filtering)
 2016-05-30 18:12:27 +02:00
Laurent Destailleur
3cc8207bb7 FIX Filter on category tag for suppliers 2016-05-30 17:20:34 +02:00
Laurent Destailleur
2290f6a123 FIX Menu statistics was not visible if module proposal was not enabled 2016-05-30 13:11:44 +02:00
Laurent Destailleur
46a0f3dab0 Fix minor bugs 2016-05-30 01:30:28 +02:00
Laurent Destailleur
2dcc578b88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-30 00:52:59 +02:00
Laurent Destailleur
3ddf427ff1 FIX Legal issue for GB. Add hidden option for this. 2016-05-30 00:52:16 +02:00
Ion Agorria
ade417855b Fill ref_supplier in product get_buyprice 2016-05-29 13:45:26 +02:00
Laurent Destailleur
4c93340de1 Merge pull request #5232 from atm-florian/develop 
Add trigger into expedition class
 2016-05-29 13:15:35 +02:00
Laurent Destailleur
a1a335025f FIX #5230 2016-05-29 12:05:11 +02:00
Laurent Destailleur
c2d8bd99dc Merge pull request #5244 from atm-gauthier/3.8_fix_mergepropal 
FIX : same page added several times on mergepropal option
 2016-05-29 12:03:35 +02:00
Laurent Destailleur
889ff16906 FIX #5239 2016-05-29 11:56:19 +02:00
Laurent Destailleur
d8c6ae0b17 Removed warnings 2016-05-29 11:26:05 +02:00
Laurent Destailleur
0b6bda910b Removed scrutinizer warning 2016-05-29 11:23:32 +02:00
Laurent Destailleur
0c6e8b626a Fix var not initialized 2016-05-29 11:20:27 +02:00
Laurent Destailleur
22d6d9497e Fix ambiguous test on ldap return of getAttributes 2016-05-29 11:20:12 +02:00
Laurent Destailleur
ba43297936 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-28 14:10:41 +02:00
Juanjo Menent
caca9f0dd2 Merge pull request #5247 from simnandez/develop 
Fix: Bad encoding and use original function 'implode' instead aliases 'join'
 2016-05-28 11:53:51 +02:00
Juanjo Menent
fb5eef3163 Merge pull request #5246 from IonAgorria/patch-1 
Fix: Fill ref_supplier in product supplier price
 2016-05-28 11:53:25 +02:00
Juanjo Menent
a63dac3a9c Merge pull request #5240 from fmarcet/peru 
Fix: Update Peru regions and departaments
 2016-05-28 11:51:46 +02:00
Laurent Destailleur
ef1e4d05ec Doc comment 2016-05-27 17:01:23 +02:00
Laurent Destailleur
9511187f6e FIX Change to status "Shipment in progress" for orders is done whane 
validating and not creating a shipment.
 2016-05-27 16:49:55 +02:00
Laurent Destailleur
c653acd4ce Minor fixes 2016-05-27 14:56:59 +02:00
Juanjo Menent
5dec8f1935 Fix: Bad encoding and use original function 'implode' instead aliases 'join' 2016-05-27 10:56:39 +02:00
Laurent Destailleur
7278d1f2c6 NEW Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check 
deposit feature.
 2016-05-27 10:38:15 +02:00
Laurent Destailleur
27da82df1f FIX Missing columns in migration 2016-05-26 21:20:10 +02:00
Laurent Destailleur
9a3251bcc9 FIX Missing columns in migration 2016-05-26 21:18:08 +02:00
Laurent Destailleur
db56e1b8a1 FIX Missing columns in migration 2016-05-26 21:17:43 +02:00
Laurent Destailleur
97278c254e Doc comment 2016-05-26 21:12:36 +02:00
Ion Agorria
6ba86e9d03 Fill ref_supplier in product supplier price 2016-05-26 20:53:01 +02:00
Laurent Destailleur
b8d5d6a383 Fix bad placeholder 2016-05-26 19:38:52 +02:00
Laurent Destailleur
b410aa57b9 Fix: Fetching category on label is not enough. We must introduce type 2016-05-25 15:36:48 +02:00
gauthier
71ee941cf8 FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty 2016-05-25 12:25:39 +02:00
gauthier
1ce91bac06 FIX : same page added several times on mergepropal option 2016-05-25 11:25:19 +02:00
Laurent Destailleur
b476153b8b Move POS at end of top menu 2016-05-25 00:02:48 +02:00
Laurent Destailleur
1617f3c62a Fix colspan 2016-05-24 20:24:51 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43:35 +02:00
Laurent Destailleur
9bd9cda224 Move to HTML5 2016-05-24 16:02:43 +02:00
Laurent Destailleur
e0812dddd2 Enhance css 2016-05-24 15:59:56 +02:00
Your Name
c581b05c26 Fix: Update Peru regions and departaments 2016-05-23 18:38:55 +02:00
florian HENRY
37d366478f change trigger position 2016-05-23 14:18:29 +02:00
Laurent Destailleur
24d7c6aae7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-23 12:27:15 +02:00
Laurent Destailleur
e2e95641a3 FIX Search supplier ref on contract 2016-05-23 12:27:02 +02:00
florian HENRY
4e707af0fd Add demo information and transsaction management 2016-05-23 09:16:47 +02:00
florian HENRY
8afaf07810 Merge remote-tracking branch 'origin/develop' into develop 2016-05-23 08:55:39 +02:00
Laurent Destailleur
f398174772 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/auguria_menu.php
	htdocs/core/menus/standard/eldy.lib.php
 2016-05-22 19:34:27 +02:00
Laurent Destailleur
426454a67b Prepare the hide left menu icon 2016-05-22 19:32:08 +02:00
Xebax
2355a0c38c FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu. 2016-05-22 17:15:22 +02:00
Laurent Destailleur
3119d77565 Add warning on deprecated param 2016-05-22 16:36:48 +02:00
Laurent Destailleur
3df464270c Remove useless code 2016-05-22 16:12:42 +02:00
Laurent Destailleur
ac84ae0ff5 Clean explorer 2016-05-22 15:29:12 +02:00
Laurent Destailleur
382df0d8f1 NEW Rest API token is no more reset at each call. We can reset it with 
param reset=1 on login call.
 2016-05-22 15:20:21 +02:00
Laurent Destailleur
ee3d25d9fa Clean code for REST API. 2016-05-22 15:10:43 +02:00
Laurent Destailleur
11ae76f4fb More neutral picto for EDM module 2016-05-22 14:39:34 +02:00
Laurent Destailleur
5e9809ccb6 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-05-22 14:34:31 +02:00
Laurent Destailleur
d8f717a6e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-22 14:31:50 +02:00
Laurent Destailleur
a9cd73b215 Fix css 2016-05-22 14:31:34 +02:00
Laurent Destailleur
b86b464931 Merge pull request #5233 from IonAgorria/email-template-hook 
NEW Hook for adding new email templates on list
 2016-05-22 14:25:06 +02:00
Laurent Destailleur
3abe1d8e81 Merge pull request #5220 from fmarcet/expenses 
The approved status is enough to expense appear in the report
 2016-05-22 14:22:38 +02:00
Laurent Destailleur
87d26ecef6 Merge pull request #5228 from simnandez/develop 
Fix issues with strict mode
 2016-05-22 14:20:05 +02:00
Frédéric FRANCE
7048191815 Update commande.class.php 2016-05-22 08:57:23 +02:00
Laurent Destailleur
db432e2cc4 Fix lot number 2016-05-21 18:12:03 +02:00
Laurent Destailleur
b95981a2be Fix missing ; at end of sql 2016-05-21 18:03:13 +02:00
Laurent Destailleur
634ebaa3b6 Fix into conf.class.php file we must use $this and not $conf 2016-05-21 16:01:14 +02:00
Laurent Destailleur
6987d3db28 Fix css 2016-05-21 15:03:02 +02:00
Laurent Destailleur
a278fd66d0 Fix color of link for categories 2016-05-21 14:51:33 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Laurent Destailleur
5fd64c81a6 Missing translation 2016-05-21 12:21:17 +02:00
Laurent Destailleur
a66901d7d5 Enhance css 2016-05-21 12:09:54 +02:00
Laurent Destailleur
075b92b4c3 FIX Field for opportunities must not be visible if option off 2016-05-21 12:06:33 +02:00
Frédéric FRANCE
9e5db0f3c6 Fix next month or next year in opensurvey 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55209-bug-calendrier-opensurvey-v3-9
 2016-05-21 09:18:16 +02:00
Ion Agorria
651b1e1d3a Hook for adding new email templates on list 2016-05-21 03:32:36 +02:00
florian HENRY
acdf781202 change tirrger name to harmonised 2016-05-20 20:12:23 +02:00
florian HENRY
82d6f4c808 add trigger on set draft order 2016-05-20 20:09:30 +02:00
florian HENRY
32a0f4c530 Add trigger into expedition class 2016-05-20 20:03:29 +02:00
Laurent Destailleur
e677390347 Fix bad property name 2016-05-19 22:04:36 +02:00
Laurent Destailleur
e6a78739bd Fix translation from a key that is a numeric 2016-05-19 21:12:09 +02:00
Juanjo Menent
341c70fa87 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-19 21:03:44 +02:00
Juanjo Menent
d8897214cd Fix issues with strict mode 2016-05-19 21:01:52 +02:00
Laurent Destailleur
453937bdfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-19 20:58:41 +02:00
Laurent Destailleur
4298b685d3 Fix css 2016-05-19 20:58:14 +02:00
Laurent Destailleur
61e824726e Merge pull request #5227 from mrsof/patch-9 
Syntax error : bad name of field
 2016-05-19 19:12:11 +02:00
Laurent Destailleur
b636451875 Fix php tag 2016-05-19 19:11:31 +02:00
Laurent Destailleur
afdef9a328 Add css 2016-05-19 18:52:22 +02:00
Laurent Destailleur
b82eabe25f Code comment 2016-05-19 18:52:12 +02:00
Sof
da2c9a0f74 Syntax error : bad name of field 2016-05-19 17:42:57 +02:00
Laurent Destailleur
7087b650d0 More precise parameter parameter targetwithdetails 2016-05-19 17:37:06 +02:00
Your Name
106f456c6b Last change 2016-05-19 16:50:18 +02:00
Laurent Destailleur
d723f26661 Fix css 2016-05-19 13:32:06 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
Laurent Destailleur
fd38db388a Rename box into widget 2016-05-19 10:05:02 +02:00
Laurent Destailleur
400572e18a Fix column size 2016-05-18 21:04:37 +02:00