Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
aspangaro
1756862a65
Typo
2015-09-06 07:56:43 +02:00
Laurent Destailleur
c06abac49e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/salaries/index.php
htdocs/contact/class/contact.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/geturl.lib.php
htdocs/core/lib/pdf.lib.php
2015-08-30 21:20:50 +02:00
Laurent Destailleur
17b69e16d2
Fix remove a bad log reporting error when not
2015-08-29 13:45:23 +02:00
Laurent Destailleur
d90b342cc9
Fix use dedicated escapment function
2015-08-20 14:34:08 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Gauthier
cc8eac67d9
FIX : Display country name instead of country id (display country id makes no sense on vcard files)
2015-07-29 12:29:33 +02:00
Laurent Destailleur
85f344a23e
Fix bad link
...
Fix missing css
2015-07-19 23:39:07 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/contact/vcard.php
htdocs/societe/consumption.php
2015-07-19 11:38:44 +02:00
Laurent Destailleur
8d7c1f8d4c
Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid
2015-07-19 11:21:21 +02:00
aspangaro
d9dd9ff688
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-16 12:25:37 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Regis Houssin
e6e39ae003
Fix: wrong translation
2015-07-14 17:28:19 +02:00
Laurent Destailleur
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
phf
f0f4d83664
FIX translate Jabberid on contact page with edit view
2015-07-08 12:33:37 +02:00
phf
c87328b362
FIX : contact country had wrong display if the country dont have translate
2015-07-02 17:00:37 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ceb9955efc
Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43
...
Conflicts:
htdocs/contact/list.php
2015-06-27 02:27:34 +02:00
Laurent Destailleur
0fe0c989ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-26 17:36:54 +02:00
Laurent Destailleur
5584acddbd
Content of popup tooltip on contact and login link
2015-06-26 17:21:03 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Laurent Destailleur
040a643ee9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/element.php
2015-06-23 18:34:39 +02:00
Laurent Destailleur
a23e2511b9
Removed useless tab
2015-06-23 18:11:21 +02:00
aspangaro
f973a1fb43
Typo "cibility"
2015-06-14 20:15:22 +02:00
Laurent Destailleur
6263e90ddb
More info on contact popup
2015-06-14 17:38:28 +02:00
Raphaël Doursenaud
6465e58032
Added tag/categories management to contact card
...
Contact part of #2571
2015-06-11 14:50:13 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
b98999c9d9
Can't delete a project
2015-06-05 15:41:27 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
phf
087b026f54
Add fetch extrafields in contact's fetch function
2015-05-26 12:40:49 +02:00
Laurent Destailleur
cb0b0fba7c
Merge pull request #2897 from atm-ph/fix_37_create_contact
...
FIX : create contact with extrafiel is null when it is require
2015-05-25 19:28:17 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Laurent Destailleur
a33809a526
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
2015-05-25 17:46:42 +02:00
phf
7b163d3b29
FIX : create contact with extrafiel is null when it is require
2015-05-25 17:36:36 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
6f5a30638c
NEW On page to see/edit contact of an ojbect, the status of contact is
...
visible (for both external and internal users).
2015-05-22 12:21:36 +02:00
Raphaël Doursenaud
a7f6bbd316
Properly escape untrusted data to prevent HTML injection.
...
First pass for #2857
2015-05-20 17:34:00 +02:00
Laurent Destailleur
bf883e1576
Minor cosmetic changes
...
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
tysauron
84935336ee
Update list.php
...
Bug pagination du bas quand recherche
2015-05-13 17:04:35 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
jfefe
25812f0071
Add picto for commercial pages titles
2015-04-18 23:17:44 +02:00
jfefe
3825b89ead
Change companies and product title picto
2015-04-18 23:13:48 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +02:00
