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

47247 Commits

Author SHA1 Message Date
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