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

35068 Commits

Author SHA1 Message Date
Regis Houssin
48f9ef2574 Fix: php strict mode saga 2014-08-28 15:53:29 +02:00
Regis Houssin
4fdd98c4a7 Fix: another strict mode alert 2014-08-28 15:34:50 +02:00
Regis Houssin
a446318649 Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:32 +02:00
Regis Houssin
cdd716eb9d Fix: error with php strict mode 2014-08-27 10:44:40 +02:00
Regis Houssin
28ad819ab4 Fix: error in strict mode 2014-08-26 09:49:15 +02:00
Alexis Algoud
b0163fbed2 FIX error sql on update ficheinter 2014-08-22 16:17:45 +02:00
Laurent Destailleur
2cba55758b Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into 
KreizIT-fix_1544

Conflicts:
	ChangeLog
 2014-08-21 23:29:38 +02:00
Regis Houssin
9fdfc740de Fix: define new ref before trigger 2014-08-18 20:25:57 +02:00
Laurent Destailleur
50eb2e2c15 Fix: backlink was wrong after deleting product or service. 2014-08-18 18:24:57 +02:00
Laurent Destailleur
741c093ac9 Merge pull request #1828 from atm-maxime/3.5 
Fix : VAT and NPR rates where coming from multiprice...
 2014-08-17 23:36:30 +02:00
Regis Houssin
86f1d59e3c Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:12:20 +02:00
Laurent Destailleur
e7a8de18bf Fix: Minimum size for captcha 2014-08-17 15:05:42 +02:00
Laurent Destailleur
3336b5bdce Fix: [ bug #1553 ] Saving User displays setup removes menu 2014-08-16 17:35:19 +02:00
Laurent Destailleur
f0c9513fa9 Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead 
of old ref
 2014-08-16 17:18:53 +02:00
Regis Houssin
d4a0c122be Fix: add global object to test condition with an object 2014-08-14 15:33:41 +02:00
Maxime Kohlhaas
e760201a59 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-14 14:26:01 +02:00
Maxime Kohlhaas
c6637207f8 Fix : VAT and NPR rates where coming from multiprice... 2014-08-14 14:25:41 +02:00
Raphaël Doursenaud
739d309a0d Updated category fix 
Categories ID can be passed as strings
PSR code formatting
 2014-08-14 08:46:51 +02:00
Cedric
8670a89ecb Fix #1544: Can remove date from invoice 2014-08-14 08:41:24 +02:00
Raphaël Doursenaud
1a9e98cda9 Fix categories bug 
When using the string type,
$typeid == 1 matched all strings making other conditions ineffective.
 2014-08-14 08:33:39 +02:00
Laurent Destailleur
91900f54c2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-14 01:54:23 +02:00
Laurent Destailleur
387c123229 Fix: List of colors was too low. 2014-08-14 01:53:54 +02:00
Laurent Destailleur
230dd3d4eb Merge pull request #1824 from FHenry/3.5 
Fix: Missing include files.lib.php in some pages to use dol_delete_recursive
 2014-08-13 23:41:04 +02:00
Laurent Destailleur
bcc0f244f0 Fix: Used wrong image 2014-08-13 19:21:31 +02:00
Laurent Destailleur
5026320fec Fix: Longueur zone texte libre incorrecte. 2014-08-13 14:44:41 +02:00
Laurent Destailleur
b2638625c9 Add comment to warn about a bug 2014-08-13 14:36:40 +02:00
Florian HENRY
329c0b2913 Fix: Missing include files.lib.php in some pages ti use 
dol_delete_recursive
 2014-08-13 12:42:55 +02:00
astebert
9c7647a7ae Update bills.lang 
Ligne 252 : Changement grammatical
- de "Paiements issue de l'acompte"
- en "Paiement issu de l'acompte"
 2014-08-12 11:45:11 +02:00
Laurent Destailleur
723bad0ece Fix: colspan 2014-08-11 18:22:00 +02:00
Laurent Destailleur
bb355ec7bd Fix: Do not force size. Must be done by function or css. 2014-08-11 18:06:23 +02:00
Laurent Destailleur
8630f397bc Fix: Do not force size. Must be done by function or css. 2014-08-11 18:02:17 +02:00
Laurent Destailleur
4d9c72f944 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-11 10:50:36 +02:00
Laurent Destailleur
8205a0e1b5 Fix: Better comment and var name 2014-08-11 10:50:08 +02:00
Laurent Destailleur
8fe2f21c28 Merge pull request #1806 from atm-maxime/3.5 
Fix : warning was not calculated on the right date
 2014-08-08 01:52:57 +02:00
Laurent Destailleur
9e8a8b4da5 Fix: regex syntax 2014-08-08 01:18:20 +02:00
Laurent Destailleur
c52794ce7f Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/projet/class/project.class.php
 2014-08-08 01:09:46 +02:00
Laurent Destailleur
e8ffb0dacf Fix: sql error on editing project with pgsql. 
Fix: Error management on project edit.
 2014-08-08 01:02:59 +02:00
Laurent Destailleur
159d0c7057 Fix: get_full_tree was not working correctly. 2014-08-07 20:21:16 +02:00
Laurent Destailleur
de76fe4951 Fix: Missing join into request. 
Conflicts:
	htdocs/compta/facture.php
 2014-08-07 15:05:31 +02:00
Laurent Destailleur
8c728ac638 Fix: bad regex syntax 2014-08-07 12:47:14 +02:00
Maxime Kohlhaas
1caf39ad22 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-07 12:26:18 +02:00
Laurent Destailleur
d0c3a7913f Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:15:18 +02:00
Laurent Destailleur
48fc945648 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
 2014-08-07 12:13:00 +02:00
Laurent Destailleur
a49bce10de Fix: When disabled, all fields must be disabled. Need backport. 
Conflicts:
	htdocs/projet/activity/list.php
 2014-08-07 12:09:28 +02:00
Laurent Destailleur
d694b10274 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-06 17:15:50 +02:00
Laurent Destailleur
98eb39bf9c Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported 2014-08-06 16:46:04 +02:00
Maxime Kohlhaas
546b31b9d0 Fix : Filtering on fourn paiement list was not working 2014-08-06 12:02:44 +02:00
Maxime Kohlhaas
27266ba7e1 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-06 11:53:56 +02:00
Laurent Destailleur
85748711b5 Fix: Table holiday_user was not initialized anymore. 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2014-08-06 09:08:28 +02:00
Maxime Kohlhaas
3499c69b7d Fix : search contact by phone was mistaking phone pro and phone perso 2014-08-06 08:54:22 +02:00
Laurent Destailleur
8f73c7a82a Fix: Remove debug 2014-08-06 01:49:22 +02:00
Laurent Destailleur
168f71ac18 Fix: Log of leaves was broken on some mysql versions. 2014-08-06 01:45:58 +02:00
Laurent Destailleur
273b9029b8 Fix: mb_strtolower function does not exists on all PHP versions. 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2014-08-06 01:45:31 +02:00
Maxime Kohlhaas
269a59e11a Fix : warning was not calculated on the right date 2014-08-05 14:17:29 +02:00
Laurent Destailleur
6a61587085 Try a fix when timezone string is not standard 
Conflicts:
	htdocs/includes/adodbtime/adodb-time.inc.php
 2014-08-04 12:49:54 +02:00
Laurent Destailleur
863d57004e Fix: Field must be invisible 2014-08-04 10:44:19 +02:00
Laurent Destailleur
d14fcf617c Merge pull request #1799 from FHenry/3.5 
Fix : Fusion PDF button on unpaid invoice is no more displayed
 2014-08-04 09:08:47 +02:00
Laurent Destailleur
e56956110f Merge pull request #1796 from atm-maxime/3.5 
Fix : shipping list SQL request was not filtering on shipping element
 2014-08-04 08:58:41 +02:00
Laurent Destailleur
9fb11cd13b Fix: Action created by triggers does not saved owner of action. 2014-08-03 23:20:32 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with 
enter keyboard input instead of lens click)
 2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00
Maxime Kohlhaas
23974daca4 Fix : shipping list SQL request was not filtering on shipping element 2014-08-01 09:57:08 +02:00
Laurent Destailleur
adb70ecf24 Fix: [ bug #1528 ] Leopard Services numeration module description is not 
translated.
 2014-07-26 17:40:07 +02:00
Laurent Destailleur
f794b820c3 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-26 17:30:41 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Laurent Destailleur
45435b597e Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:18:19 +02:00
Laurent Destailleur
3451276b8b Merge pull request #1755 from marcosgdf/translation-taxes 
Corrected VAT expenses behaviour name
 2014-07-20 04:56:02 +02:00
Laurent Destailleur
c289e8a23d Merge pull request #1754 from ndrosis/patch-3 
Fix Link product, In list view and label product
 2014-07-20 04:54:48 +02:00
Laurent Destailleur
6499c4ff70 Merge pull request #1750 from nicoplh/patch-1 
Update impayees.php
 2014-07-20 04:45:47 +02:00
Laurent Destailleur
a74b65df0e Fix: Add max height to solve pb with very large logo. 2014-07-20 04:29:47 +02:00
Laurent Destailleur
6637ea51e3 Fix: [ bug #1534 ] Unknown error when deleting a product photo under 
special circumstances
 2014-07-19 16:41:14 +02:00
Marcos García de La Fuente
7794101e10 Corrected VAT expenses behaviour name 2014-07-19 05:36:29 +02:00
nicoplh
2cfc5f10a8 Update impayees.php 
remove useless type alpha.
 2014-07-18 14:47:23 +02:00
Drosis Nikos
4f0d01d5c5 Fix Link product, In list view and label product 
This Fix added and develop.
 2014-07-18 14:36:46 +03:00
nicoplh
25a591bd03 Update impayees.php 
Add column ref.Client with search module.
 2014-07-17 16:21:23 +02:00
Laurent Destailleur
32a6d59b64 Merge pull request #1734 from FHenry/3.5 
Fix
 2014-07-14 23:13:03 +02:00
Laurent Destailleur
f55814e3b2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-07-14 23:11:33 +02:00
Laurent Destailleur
0bfc90ee9a Merge pull request #1744 from marcosgdf/bug-linkedprojects 
Fixed a bug introduced in commit 0916d2cf3b
 2014-07-14 23:05:16 +02:00
Juanjo Menent
3930c8829e Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:38:00 +02:00
Marcos García de La Fuente
b0ae2fe2aa Fixed a bug introduced in commit 0916d2cf3b 2014-07-14 01:32:57 +02:00
Marcos García de La Fuente
4bc8e026b6 [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly 2014-07-13 19:51:44 +02:00
Florian HENRY
b9df48d48c Fix 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
 2014-07-11 15:53:31 +02:00
Laurent Destailleur
0cba9b8fae Merge pull request #1726 from atm-alexis/3.5 
FIX : Bad rank when a bill was made by multiple orders
 2014-07-11 12:25:50 +02:00
Florian HENRY
3f23b116c6 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un 
projet
 2014-07-11 11:44:54 +02:00
Alexis Algoud
6d83882a5d FIX : Bad rank when a bill was made by multiple orders 2014-07-08 09:00:41 +02:00
Laurent Destailleur
0eabf26d27 Fix: Checkstyle 2014-07-08 01:15:59 +02:00
Laurent Destailleur
41dc0681c6 Merge pull request #1715 from defrance69/patch-5 
getlibstatut added
 2014-07-08 00:31:07 +02:00
Laurent Destailleur
96ec3ad7f4 Fix: Allow percent to solve presentation pb by some pages. 2014-07-07 00:14:24 +02:00
BENKE Charles
4d9f78dc07 getlibstatut added 
Add function getlibstatut and libstatut on task (fk_statut allready present on project_task table)
 2014-07-06 15:06:34 +02:00
Laurent Destailleur
f22a04810e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-04 11:59:01 +02:00
Laurent Destailleur
11abba30b3 Fix: Add information to help debug pb with TZ. 2014-07-04 11:58:41 +02:00
Marcos García de La Fuente
b70a090de2 Corrected English typo 2014-07-02 19:10:17 +02:00
Laurent Destailleur
57b546650a Fix: Hide title of event when agenda module disabled. 2014-06-30 19:03:52 +02:00
Laurent Destailleur
198a8d40f7 Fix: Missing translation 2014-06-29 13:53:07 +02:00
Laurent Destailleur
dd1c5ce3d8 Fix: Missing commit 2014-06-28 15:03:11 +02:00
Laurent Destailleur
ef8b555750 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to 
sender.
 2014-06-28 14:48:00 +02:00
Laurent Destailleur
d903db6a18 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-28 01:54:20 +02:00
Laurent Destailleur
18838ccfa0 Fix: Correct name for thirdparty created from member. 2014-06-28 01:53:56 +02:00
Laurent Destailleur
092d1b725d Merge pull request #1684 from KreizIT/triggers 
FIX #1460, #1461
 2014-06-26 22:59:55 +02:00
Raphaël Doursenaud
f5980a1d20 Fix database prefix usage 2014-06-26 15:52:31 +02:00
Laurent Destailleur
018771c0f5 Fix: sql syntax error (missing ' on date) 2014-06-25 20:07:21 +02:00
Laurent Destailleur
f64f0d6933 Fix: If showempty is 0 and empty, do not show button. 2014-06-24 23:43:53 +02:00
Laurent Destailleur
54f55cf03e Fix: No change if error on trigger 2014-06-24 22:14:45 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
0c382ef97e Remove failure test on trigger 2014-06-24 10:55:21 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
Laurent Destailleur
04ead87aea Merge pull request #1681 from KreizIT/FIX1485 
FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
 2014-06-23 20:20:31 +02:00
Cedric
0f267559c6 FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless loop 2014-06-23 12:28:59 +02:00
Laurent Destailleur
b4add020a9 Fix: Question about warehouse must not be done when module stock is 
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
 2014-06-23 11:47:07 +02:00
Laurent Destailleur
d22bfa8847 Fix: Cloning must use dol_clone 2014-06-21 18:16:22 +02:00
Laurent Destailleur
0778d38b2c Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:08:32 +02:00
Laurent Destailleur
d19b34cc7e Fix: Renaming a project with uplaoded files failed. 2014-06-21 15:45:53 +02:00
Laurent Destailleur
76532218c2 Fix: [ bug #1476 ] Invoice creation form loses invoice date when there 
is a validation error
 2014-06-21 15:35:30 +02:00
Laurent Destailleur
39eea995a4 Merge pull request #1675 from FHenry/3.5 
Fix == instaed of = in variable affectation
 2014-06-20 16:52:44 +02:00
Laurent Destailleur
28fd8c6862 Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top 
margin.
 2014-06-20 14:04:37 +02:00
Laurent Destailleur
a2065d0b6a Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a 
supplier order.
 2014-06-20 13:49:59 +02:00
Laurent Destailleur
fcb00b2024 Fix: [ bug #1425 ] 2014-06-20 13:38:44 +02:00
Florian HENRY
d09ccf5855 Fix == instaed of = in variable affectation 2014-06-20 13:21:49 +02:00
Laurent Destailleur
e7f08c6d37 Merge pull request #1674 from atm-maxime/3.5 
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...
 2014-06-20 13:20:50 +02:00
Laurent Destailleur
c903fe9340 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-06-20 13:20:07 +02:00
Laurent Destailleur
1cffc8d8f6 Merge branch '3.5' of github.com:fappels/dolibarr into fappels-3.5 2014-06-20 13:18:28 +02:00
Laurent Destailleur
6740e0321a Merge pull request #1670 from FHenry/3.5 
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
 2014-06-20 13:16:11 +02:00
Laurent Destailleur
221d7b56aa Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:52:08 +02:00
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:48:08 +02:00
Maxime Kohlhaas
46e54ac64e Fix 1455 outstanding amount 2014-06-20 10:53:56 +02:00
Florian HENRY
40f5911f52 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 
product (on supplier order part)
 2014-06-20 09:36:31 +02:00
Maxime Kohlhaas
aaabf9647d Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix) 2014-06-20 09:33:25 +02:00
Francis Appels
5b5473bc7c Fix: [ bug #1509 ] Expedition admin submit error 
Expedition admin free text & watermark submit error
 2014-06-19 10:02:58 +02:00
Florian HENRY
0645189432 If multiprice level is used the VAT on addline is not correct 2014-06-18 10:56:38 +02:00
Florian HENRY
03156b58e3 [ bug #1452 ] variable used but not defined 2014-06-17 11:30:41 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project 
card
 2014-06-17 11:18:30 +02:00
Laurent Destailleur
11cb23f4ac Merge pull request #1662 from grandoc/3.5 
Fix : num paiement was not displayed
 2014-06-14 13:28:22 +02:00
Laurent Destailleur
0c5c1cf849 Merge branch '3.5' of github.com:FHenry/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 13:21:32 +02:00
Laurent Destailleur
0453daae72 Merge pull request #1656 from netfab/3.5 
html fix : missing </tr>.
 2014-06-14 12:34:06 +02:00
Laurent Destailleur
cf948065f4 Fixes for bug 1449, 1450 and 1451 #1654 2014-06-14 12:30:48 +02:00
Laurent Destailleur
c67dad0240 Merge branch 'bug-1432' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1432

Conflicts:
	ChangeLog
 2014-06-14 12:27:47 +02:00
Florian HENRY
42e6727e5d Better error return 2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Florian HENRY
aecede08c4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-13 14:38:44 +02:00
philippe
d508c076e8 Fix : num paiement was not displayed 2014-06-13 12:10:26 +02:00
Laurent Destailleur
1a9e53e21f Fxi: Correct property name 2014-06-12 22:00:16 +02:00
Florian HENRY
40a5d20cc8 Do not reset index on product import !!! 2014-06-12 16:46:20 +02:00
Laurent Destailleur
b4ef780274 Fix: When project was disabled, label was not visible 2014-06-12 15:41:00 +02:00
Laurent Destailleur
1ba02185e5 Fix: Error nor reported 2014-06-12 15:32:25 +02:00
Florian HENRY
f796a6408e Do not display dictionnay for non activated module 2014-06-12 15:28:11 +02:00
Florian HENRY
80facefa23 Fix [ bug #1454 ] Mention de bas de page erroné 2014-06-12 09:13:51 +02:00
Laurent Destailleur
bb8516274e Fix: socid was not caught. 
Fix: numbering modules was not correctly scanned.
 2014-06-11 18:01:15 +02:00
Laurent Destailleur
40742e84a9 Fix: Bad balance of colspan. 
Fix: Filter on status was not visible when selected from url.
Fix: Filtering on status was last when asking to sort.
 2014-06-11 16:47:00 +02:00
Fab
2fed26d68b html fix : missing </tr>. 2014-06-11 08:01:05 +02:00
Marcos García de La Fuente
e7cfb719b9 [ bug #1432 ] Trigger SHIPPING_CREATE ignores interception on error 2014-06-10 12:05:31 +02:00
Laurent Destailleur
41adaeea99 Merge branch 'bug-1443' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1443

Conflicts:
	ChangeLog
 2014-06-10 01:42:39 +02:00
Laurent Destailleur
5853b9eb30 Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1416

Conflicts:
	ChangeLog
 2014-06-10 01:37:43 +02:00
Laurent Destailleur
9e91225936 Merge pull request #1648 from marcosgdf/bug-1415 
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
 2014-06-10 01:28:56 +02:00
Marcos García de La Fuente
85d906078a Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or limit date for payment 2014-06-09 23:50:57 +02:00
Marcos García de La Fuente
0b73b44f34 Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the supplier order card 2014-06-09 23:38:06 +02:00
Marcos García de La Fuente
8a22a708b4 Fixed the bug for supplier invoice and supplier order pages 2014-06-09 22:55:38 +02:00
Marcos García de La Fuente
0810e6756a Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration 2014-06-09 22:48:16 +02:00
Laurent Destailleur
4c3c62515d Fix: Confusion between is_int and is_numeric. 2014-06-09 15:21:20 +02:00
Laurent Destailleur
9ba4b53a88 Merge pull request #1645 from FHenry/3.5 
Start fix [ bug #1437 ] Securitu Issue
 2014-06-09 15:10:55 +02:00
Florian HENRY
77a9d4eb71 Start fix [ bug #1437 ] Securitu Issue 
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
 2014-06-09 12:34:10 +02:00
Laurent Destailleur
2ec4c56f6b Merge pull request #1640 from FHenry/3.5 
3.5
 2014-06-06 15:34:57 +02:00
Laurent Destailleur
768163c6fc Fix: Easy fix to solve pb with pagebreak when adding image 2014-06-06 12:57:12 +02:00
Laurent Destailleur
905f700136 Fix: Pb with pagebreak when adding image 2014-06-06 11:57:45 +02:00
Laurent Destailleur
c45aace9b9 Add easy fix to solve pb of links for some modules. 2014-06-05 23:30:20 +02:00
Laurent Destailleur
03ca7e6b63 Fix: Missing global 2014-06-05 22:42:49 +02:00
Florian HENRY
ebe49b0525 Same bug, missing select column use in result 2014-06-05 10:58:38 +02:00
Florian HENRY
e8f8644bf4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-05 10:53:20 +02:00
Florian HENRY
44a1059158 Fix warining message during societe activation 2014-06-05 10:53:00 +02:00
Marcos García de La Fuente
4c11e37203 Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text 2014-06-03 15:45:03 +02:00
Laurent Destailleur
fc2bd4ab4e Fix: [ bug #1380 ] Customer invoices are not grouped in company results 
report
(cherry picked from commit bd061f4)
 2014-06-02 02:16:49 +02:00
Laurent Destailleur
6b6261a803 Fix: Use last name and not name. 2014-05-30 13:34:51 +02:00
Laurent Destailleur
4a96fd0d77 Fix: No error once multicompany module has been removed. 2014-05-30 13:08:01 +02:00
Laurent Destailleur
efd9337c9f Fix: Hierarchy view with multicompany 2014-05-30 12:55:00 +02:00
Laurent Destailleur
449678d687 Fix: get_full_tree must follow same filter rule thant list of users 2014-05-30 12:43:07 +02:00
Laurent Destailleur
3c4dfba99e Fix: Filter on status 2014-05-30 12:32:19 +02:00
Laurent Destailleur
040f80b0f6 Merge pull request #1631 from FHenry/3.5 
Fix fiche fourn order and stuff visility according entity
 2014-05-30 11:30:18 +02:00
Laurent Destailleur
67bd18f5cc Fix: [ bug #1406 ] Impossible de modifier une facture fournisseur 2014-05-29 20:25:41 +02:00
Laurent Destailleur
b75dea98ee Fix: sql syntax 2014-05-29 19:46:32 +02:00
Laurent Destailleur
7a670c5bc7 Fix: pgsql driver not complete 
Conflicts:
	htdocs/core/db/pgsql.class.php
 2014-05-29 19:39:34 +02:00
Florian HENRY
32e3475700 Fix fiche fourn order and stuff visility according entity 2014-05-27 18:58:42 +02:00
Laurent Destailleur
48bbcc6f4a Fix: Button was not be enabled. 2014-05-27 10:45:58 +02:00
Laurent Destailleur
33ef8595dc Fix: Bad alignement 2014-05-27 10:19:34 +02:00
Laurent Destailleur
51b6be4a64 Fix: If user has no perm to see other user, see himself. 2014-05-26 17:33:19 +02:00
Laurent Destailleur
7bd46d8aee Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-26 17:28:00 +02:00
Laurent Destailleur
1199d54fb2 Fix: When user has no permissions to see all other user, we must keep 
only user.
 2014-05-26 17:21:48 +02:00
Laurent Destailleur
d41f87acab Fix: Option to limit was not used everywhere. 2014-05-26 01:27:22 +02:00
Laurent Destailleur
859b1cac4f Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-26 01:14:35 +02:00
Laurent Destailleur
5d9ec6807c Fix: Show duration only if defined. 2014-05-26 01:14:15 +02:00
Laurent Destailleur
4076a4a643 Fix: select_date accepts -1, '' or a date but not '0' 2014-05-25 14:51:56 +02:00
Laurent Destailleur
44ecd504bc Fix: Field ref_supplier and label not filled. Just add FIXME because fix 
is too heavy for a maintenance release.
 2014-05-25 04:12:08 +02:00
Laurent Destailleur
ae01c785c5 Fix: Do not show ref supplier title if ref_supplier not set (currently 
always the case with 3.5).
 2014-05-25 03:57:13 +02:00
Laurent Destailleur
9bc1a6b4f5 Fix: favicon must use dol_buildpath and not hardcoded path 
Conflicts:
	htdocs/core/lib/security2.lib.php
 2014-05-24 18:29:22 +02:00
Laurent Destailleur
a51e18a5a7 Fix: $error var must use type int and be increased when error found. 
Using $error as boolean at some place was source of error.
 2014-05-24 15:20:26 +02:00
Laurent Destailleur
872e764c94 Fix: html detection was not working with hx tags. 2014-05-24 14:57:41 +02:00
Laurent Destailleur
2a6b2a4540 Fix: Stat page show no cache when there is, if user was using apc. 2014-05-24 14:00:58 +02:00
Laurent Destailleur
b11ef37c58 Fix: Bad balance of table 2014-05-24 12:59:44 +02:00
Laurent Destailleur
1df758320d Fix: the delivery date must not be set with date of proposal. 2014-05-24 12:55:39 +02:00
Laurent Destailleur
f34aadef3d Fix: css 2014-05-23 21:06:53 +02:00
Laurent Destailleur
23e951ff2a Fix: select_date accepts -1 or '' but not 0 2014-05-23 20:54:23 +02:00
Laurent Destailleur
a63d085181 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-23 20:22:40 +02:00