Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
45,758 Commits 36 Branches 189 Tags
9c99cae9110b7acc21bf4960d3b9531f91984c24
Commit Graph

514 Commits

Author SHA1 Message Date
Laurent Destailleur
9c99cae911 FIX XSS security using the onerror and missing escapement on type of 
member page.
 2015-06-28 23:32:38 +02:00
Laurent Destailleur
a7cec18081 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/categories/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/upgrade2.php
	htdocs/product/liste.php
 2015-06-14 17:11:36 +02:00
Laurent Destailleur
14a8a2269b FIX End log must use same level then start log. 2015-06-14 16:59:35 +02:00
Laurent Destailleur
35dd069ec9 Fix #2994 2015-06-08 18:17:13 +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
Florian HENRY
32e067c806 Remove debug 2015-04-16 14:22:48 +02:00
Laurent Destailleur
e508b28d74 Fix doliforge bug 1707 2015-04-15 18:53:39 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok. 
Works for canada and ivory cost.
 2015-04-11 22:51:53 +02:00
Laurent Destailleur
42c2c81e28 Fix detection of html was wrong with img 2015-03-26 12:05:52 +01:00
Laurent Destailleur
73266bb965 Fix error when using a log hangler that make output into the http 
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
 2015-03-21 01:22:05 +01:00
Laurent Destailleur
bc3f9bf800 Fix: the visible version was not enough to know version of dolibarr. We 
also need the MAIN_FEATURES_LEVEL.
 2015-03-13 18:11:31 +01:00
Laurent Destailleur
35733c4c08 More comments 2015-03-03 17:47:17 +01:00
Laurent Destailleur
ce8cbee5d2 Merge pull request #2399 from marcosgdf/misc 
misc
 2015-03-02 00:31:27 +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
938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
 2015-02-20 22:51:47 +01:00
Laurent Destailleur
e1e31de229 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-20 20:15:04 +01:00
Laurent Destailleur
ec56667f5e Fix: [ bug #1849 ] Broken flag image when a contact does not have a 
country set
 2015-02-19 09:44:22 +01:00
Laurent Destailleur
d1a4b6c2c5 phpcs 2015-02-19 00:04:35 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Marcos García de La Fuente
3efb737cbf Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php" 2015-02-16 12:30:10 +01:00
Marcos García de La Fuente
6f08893016 Fix: [ bug #1846 ] Browser IE11 not detected 2015-02-16 12:26:20 +01:00
Marcos García de La Fuente
023175b9f1 PHPDoc and misc fixes for several folders 2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
58a61e1294 Changed int typecast to float 2015-02-10 00:23:32 +01:00
Marcos García de La Fuente
949f9e40a0 Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object 2015-02-10 00:20:47 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management. 
Added phpunit to avoid this in future.
 2015-02-03 11:25:51 +01:00
Laurent Destailleur
7809013b96 Message is more clear. 2015-02-02 13:33:16 +01:00
Laurent Destailleur
6976aec04b Merge pull request #2289 from accett/patch-2 
Currency symbol in Mexico
 2015-01-31 19:40:57 +01:00
Laurent Destailleur
d6dc495a42 Removed bad print 2015-01-30 16:01:56 +01:00
AcceTT Soluciones Computacionales
608b099934 Currency symbol in Mexico 
I tried to change the order of the currency symbol in Mexico is before.
 2015-01-26 21:38:43 -06:00
Laurent Destailleur
ffde00de81 Fixed date change was lost when changing event assignement. 2015-01-26 10:31:41 +01:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration. 
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
 2015-01-25 22:29:36 +01:00
Laurent Destailleur
3ebaaa38d2 Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC 2015-01-25 16:04:37 +01:00
Laurent Destailleur
9876b30387 Need more info to find bugs 2015-01-17 16:22:37 +01:00
Laurent Destailleur
e20c1decdf Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +01:00
Laurent Destailleur
68441a563a Fixed: Avoid space into address string 2015-01-14 19:17:58 +01:00
fentman
9049931ff0 Change to $listofcurrenciesbefore for GBP + AUD 
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
 2015-01-09 22:55:17 +01:00
aspangaro
b4b5b35afa Skype :: Better presentation 2015-01-04 20:17:49 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
d9aba405dd Fix: utf must be default value. 2014-12-18 10:09:47 +01:00
Laurent Destailleur
a8052d8ea4 Fixed: Several fix in color management (function at wrong place, mark 
param that are deprecated, convertion of value to get correct
format in all situation)
 2014-12-08 19:12:27 +01:00
Juanjo Menent
430b2ff8db Fix: datepicker first day of week can be monday by setting into 
display setup
 2014-12-06 11:00:49 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Laurent Destailleur
38062177d3 Doxygen 2014-11-28 00:37:46 +01:00
Francis Appels
18406fc550 Fix: Show sender Country on PDF docs 
Show sender Country on PDF docs when sender Country != receiver Country
 2014-11-25 14:26:45 +01:00
Laurent Destailleur
e3a8041b0d Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/facture.php
	htdocs/user/fiche.php
 2014-11-16 15:46:08 +01:00