fmarcet
1a02f6aa80
Fix: Masks works with thirdparty type
2015-03-04 18:18:55 +01:00
Laurent Destailleur
081875c4d9
Merge pull request #2383 from aspangaro/3.7-patch4
...
FIXED: Remove condition to show accountancy field on user.
2015-03-04 18:02:09 +01:00
Marcos García de La Fuente
41c55d1913
Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value
2015-03-04 11:55:17 +01:00
Laurent Destailleur
fa2e57eaa3
pcpcs
2015-03-04 01:10:23 +01:00
Laurent Destailleur
35733c4c08
More comments
2015-03-03 17:47:17 +01:00
Laurent Destailleur
7050ef6176
Fix parameter notolderthan was not effective
2015-03-02 17:56:37 +01:00
Laurent Destailleur
79023cddb0
Fix external calendar for users were not visible if no global calendar
...
was set.
2015-03-02 17:34:50 +01:00
Marcos García de La Fuente
77605bce3e
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
2015-03-02 13:33:31 +01:00
Florian HENRY
d80a8bbdba
revert bug1840 to eldy solution
2015-03-02 10:13:06 +01:00
Florian HENRY
d9621a1d23
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
...
Conflicts:
htdocs/contrat/card.php
2015-03-02 10:02:54 +01:00
Laurent Destailleur
48356005c3
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-02 03:00:29 +01:00
Laurent Destailleur
3475433eaf
Fix: the bank information were visible into pdf but were not using
...
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Marcos García de La Fuente
7876238823
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
...
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
2015-03-02 01:36:27 +01:00
Laurent Destailleur
ce8cbee5d2
Merge pull request #2399 from marcosgdf/misc
...
misc
2015-03-02 00:31:27 +01:00
Laurent Destailleur
6d3381bfa0
Merge pull request #2398 from marcosgdf/deprecated
...
Marked getStaticMember as deprecated
2015-03-02 00:23:36 +01:00
Laurent Destailleur
8a67a3af10
Fix missing one param
2015-03-01 16:12:55 +01:00
Laurent Destailleur
8a00109baf
Fix: Several bugs int replenishment feature.
2015-03-01 16:05:20 +01:00
Laurent Destailleur
5f29942257
Fix link missing icon
2015-03-01 14:03:14 +01:00
Laurent Destailleur
9b0dce2e34
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/lib/agenda.lib.php
2015-03-01 13:58:56 +01:00
Laurent Destailleur
be033c1947
Fix bad position of html tags
...
Conflicts:
htdocs/opensurvey/card.php
2015-03-01 13:54:24 +01:00
Laurent Destailleur
a421564b84
Fix phpcs
2015-03-01 13:52:58 +01:00
Laurent Destailleur
f8e9a38e5c
Fix: Avoid empty table into setup when module are missing.
2015-02-28 19:37:44 +01:00
Laurent Destailleur
7baaf18ad1
Fix can be null
2015-02-28 18:44:06 +01:00
Laurent Destailleur
1c9eec1a17
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-02-28 18:18:58 +01:00
Laurent Destailleur
1cdd77a671
Fix: use bad var
2015-02-28 18:18:41 +01:00
Juanjo Menent
8c6ee6b7a8
Trad: Syncro from transifex
2015-02-27 18:20:35 +01:00
Juanjo Menent
88d1d203d8
Fix: Bad SEPA xml file creation
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2015-02-27 18:13:24 +01:00
Juanjo Menent
7ca8fdb20c
PHP norms
2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47
Fix: Bad SEPA xml file creation
2015-02-27 17:55:15 +01:00
aspangaro
8f388aaa9b
Merge remote-tracking branch 'Upstream/3.7' into 3.7-patch4
2015-02-26 20:48:21 +01:00
aspangaro
47c41f6a85
Add a test to enable field only when module salary is used
2015-02-26 20:47:06 +01:00
Laurent Destailleur
828716420b
Comment of function was not correct
2015-02-26 16:19:45 +01:00
Laurent Destailleur
d6438a51ab
Add log to help track bug
2015-02-26 15:24:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
fe7889e266
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
386eaf0911
Fix: bad sql request
2015-02-26 12:11:31 +01:00
Marcos García de La Fuente
fb959abc63
Misc PHPdoc fixes
2015-02-25 18:24:36 +01:00
Marcos García de La Fuente
0a5f17f179
Undefined variable + Unreachable statement
2015-02-25 18:06:54 +01:00
Marcos García de La Fuente
91fa823075
Marked getStaticMember as deprecated
2015-02-25 18:03:31 +01:00
Laurent Destailleur
be529e7269
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-02-25 16:53:33 +01:00
Laurent Destailleur
76640b6b77
Fix removed warning
2015-02-25 15:01:25 +01:00
Laurent Destailleur
3fb3e4af4e
Merge pull request #2386 from lrq3000/3.7
...
Fix lastrowid-*table* option when defining imports
2015-02-24 17:16:17 +01:00
Laurent Destailleur
72da9b52af
Merge pull request #2380 from marcosgdf/bug-1825
...
Better fix for bug 1825
2015-02-24 17:07:17 +01:00
Laurent Destailleur
625c494dee
Merge pull request #2385 from aspangaro/3.7-patch5
...
FIXED: Bankjournal is generated from id_account now
2015-02-24 17:04:01 +01:00
Laurent Destailleur
474a4125a4
It is better to point to portal home page instead of sub page.
2015-02-24 16:51:20 +01:00
Laurent Destailleur
74f15680e1
Fix missing fields into import of thirdparties.
...
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
2015-02-24 15:40:50 +01:00
Laurent Destailleur
44c392ca23
Fix missing profid5 and 6
2015-02-24 13:35:37 +01:00
Laurent Destailleur
9842e816d0
Fix bad sql type
...
Fix no input outside tr-td
2015-02-24 11:24:15 +01:00
Laurent Destailleur
0a5c3e1fa8
Fix price must be hidden if context is not on sell
2015-02-23 23:15:41 +01:00
