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

691 Commits

Author SHA1 Message Date
Marcos García de La Fuente
60e2524fc2 Merge remote-tracking branch 'upstream/develop' into better-practice 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/FunctionsLibTest.php
 2015-02-28 14:39:14 +01:00
Marcos García de La Fuente
f117b65a17 Removed silent operator for PHP 4 in function dol_html_entity_decode 2015-02-25 23:01:07 +01:00
Marcos García de La Fuente
f2fededd2c Drop usage of deprecated dol_htmlentities function 2015-02-25 22:48:45 +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
Marcos García de La Fuente
40a5c15616 Improved getBrowserInfo documentation 2015-02-25 16:45:14 +01:00
Marcos García de La Fuente
f598963d6b Fixed regression 2015-02-25 16:41:51 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Marcos García de La Fuente
7e07638fba Little refactor 2015-02-23 10:51:43 +01:00
Marcos García de La Fuente
71b98ee82b Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them. 2015-02-23 10:42:10 +01:00
Marcos García de La Fuente
702c19dab3 Refactored function getBrowserInfo 2015-02-22 13:17:57 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb Better practice in getBrowserInfo 2015-02-22 12:35:51 +01:00
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +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
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +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
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr 
standard to replace current one.
 2015-02-14 18:39:45 +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
3bdf8864a9 New: Add option MAXTABS_IN_CARD to limit number of visible tabs. 2015-02-07 04:24:31 +01:00
Laurent Destailleur
01541e4152 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/core/datepicker.php
 2015-02-03 12:17:45 +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
21c78cc392 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-02 21:45:31 +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
13019f1f33 Clean code introduced by last PR. 2015-01-31 17:02:36 +01:00
Laurent Destailleur
1e72d49858 Merge pull request #2286 from accett/patch-1 
New: Introduce num to text function and use sign before amout for mexico currency
 2015-01-31 15:55:16 +01:00
Laurent Destailleur
291340a39f Merge remote-tracking branch 'origin/3.7' into develop 2015-01-30 16:34:18 +01:00
Laurent Destailleur
d6dc495a42 Removed bad print 2015-01-30 16:01:56 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +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
accett
62ae75b3bf Update for Mexico Users 
Add MXN in the array for countries use the sign currency before. (Mexico does). Add function float2text_moneda to convert the number in the text form for tickets, facture, proposals, etc.
 2015-01-26 14:38:02 -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
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
9876b30387 Need more info to find bugs 2015-01-17 16:22:37 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +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
Laurent Destailleur
a2c9d5bd4a Fixed balance of td introduced by MAX_TAB option. 2015-01-14 19:10:21 +01:00
Laurent Destailleur
e10b5637d4 Fixed: Avoid spaces into address string 2015-01-14 18:54:56 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +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
fentman
742ec954cd 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-08 11:21:25 +11:00
aspangaro
b4b5b35afa Skype :: Better presentation 2015-01-04 20:17:49 +01:00
Laurent Destailleur
baa247ea86 Fixed: doxygen 2014-12-30 21:24:57 +01:00
Laurent Destailleur
d72d056e02 Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +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
BENKE Charles
b45bd06475 Update functions.lib.php 
Add feature to limit the number of tabs in a card (based on google menu practice)
function actived with MAXTABS_IN_CARD dictionnary
watch result here : http://www.dolibarr.fr/forum/12-howto--aide/52135-tuto-ajouter-a-un-doc-pdf-un-extrafields#56008
or here.
All the code is in one function, need to explode/refactoring it on diferent css
 2014-12-22 12:26:04 +01:00
Laurent Destailleur
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-18 12:34:41 +01:00
Laurent Destailleur
d9aba405dd Fix: utf must be default value. 2014-12-18 10:09:47 +01:00
Frédéric FRANCE
66f634f217 Update functions.lib.php 2014-12-09 20:47:54 +01:00
Frédéric FRANCE
590618eb38 Update functions.lib.php 2014-12-09 20:17:13 +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
Laurent Destailleur
0ea7d51b22 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:05:22 +01:00
Laurent Destailleur
c731321024 New: Function yn can show a visual checkbox 2014-12-07 01:57:23 +01:00
Juanjo Menent
fe23a851e7 Fix: datepicker first day of week can be monday by setting into 
display setup
 2014-12-06 11:03:48 +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
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Florian HENRY
c0a3606a59 Fix problem on task creation with chrome for french browser. 2014-11-12 22:53:23 +01:00
Laurent Destailleur
0b70d26275 Keep commented code to keep a chance for old php version to work. 2014-11-07 22:06:51 +01:00
Laurent Destailleur
b74bdb8f7d Fix: Bad error message 2014-11-02 11:39:30 +01:00
Laurent Destailleur
9619c0cdea Fix: [ bug #1581 ] SQL injection possbile 2014-10-27 00:58:56 +01:00
Laurent Destailleur
0fc1c85b34 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 00:42:52 +02:00
Laurent Destailleur
9b24cccd0b Fix: Better layout detection 2014-10-19 12:24:36 +02:00
Laurent Destailleur
dbbf31d87b Fix: Restore comaptibility with all languages. 
Fix: Corrupting data function.
 2014-10-18 00:41:21 +02:00
Laurent Destailleur
e2524fbf77 Fxi: Filter on list view was not correct. 2014-10-16 21:34:35 +02:00
Laurent Destailleur
7a68d9a940 Miscellaneous fixes 2014-10-16 20:55:13 +02:00
Laurent Destailleur
a94f7dc3ad Revert "Add function dolEscapeXML" 
This reverts commit 756b1d31ad.
 2014-10-16 01:21:33 +02:00
Laurent Destailleur
b90011aeb1 Add function dolEscapeXML 2014-10-16 01:21:10 +02:00
Laurent Destailleur
756b1d31ad Add function dolEscapeXML 2014-10-16 01:01:30 +02:00
Laurent Destailleur
2cf21f856c Fix: table name differs. 2014-10-14 01:47:31 +02:00
Laurent Destailleur
77ed7bf5df Merge branch 'develop-HiddenMailPasswordForgotten' of 
github.com:Devensys/dolibarr into
Devensys-develop-HiddenMailPasswordForgotten

Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-10-11 23:44:50 +02:00
Andrelec1
269b960d9a Add support tld with dots 2014-10-10 15:18:24 +02:00
Andrelec1
f4f1f45d5a copyright and annotation 2014-10-10 15:01:10 +02:00
Andrelec1
7978b4503d Add function hideMail and use 2014-10-10 14:57:07 +02:00
Laurent Destailleur
de5005ca54 Fix: Avoid duplicate error message 
Fix: pgsql syntax error
 2014-10-08 15:35:39 +02:00
Laurent Destailleur
4c4485d0ee More comment to explain and remove a todo. 2014-10-08 15:24:35 +02:00
Regis Houssin
cc553514af Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have 
the same name as the module
 2014-10-08 14:51:16 +02:00
Laurent Destailleur
5c5f725a34 Fix scrutinizer 2014-10-05 01:22:17 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Laurent Destailleur
ca3c5d9513 Fix: invalid list of params 
Fix: loading of sql menu
 2014-09-19 14:36:55 +02:00
Raphaël Doursenaud
0f71b7e0b0 FIX: Typo 2014-09-19 03:07:54 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
e64e161a58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-18 17:54:24 +02:00
Laurent Destailleur
49db9d1304 Fix: Avoid explode when separator : is not. 2014-09-18 17:12:51 +02:00
Maxime Kohlhaas
64fe082539 New generic functions for search pictos, to be used in every lists 2014-09-17 17:59:00 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
6d9cc15856 Fix: Function unaccent was not enough complete. 2014-09-06 14:40:43 +02:00
Laurent Destailleur
782aaf52ae Add method setEventMessages (can deal this->error and this->errors) 2014-09-04 14:39:18 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Regis Houssin
a8668aee11 Fix: add global object to test condition with an object 2014-08-14 15:35:08 +02:00
Regis Houssin
d4a0c122be Fix: add global object to test condition with an object 2014-08-14 15:33:41 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
Laurent Destailleur
e0a874b5fd Merge pull request #1808 from KreizIT/GETPost_review 
Add improvement to GETPOST function
 2014-08-13 23:44:58 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
ebcc68cdfa Add commented code to use "clear" cookie. This help debug. 2014-08-08 13:09:06 +02:00
KreizIT
180cc0b200 Add description for new param 2014-08-06 17:12:28 +02:00
KreizIT
cfe35f32e8 - Add improvement to GETPOST function 
- Review thirdparty cards for illustration of new GETPOST functionality
 2014-08-06 15:59:36 +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
95da79108f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-31 17:22:37 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into 
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-31 17:21:46 +02:00
frederic34
6645b8a454 Cannot redeclare getmypid() 2014-07-31 10:21:47 +02:00
Laurent Destailleur
0f9aa69e4e Fix: New: Differentiate text and img for better accessibility. 2014-07-29 21:34:23 +02:00
Laurent Destailleur
b57371bfa1 Fix: New: Differentiate text and img for better accessibility. 2014-07-29 20:21:01 +02:00
Laurent Destailleur
3011ecf6df Fix: PHPCS 2014-07-28 19:55:12 +02:00
Laurent Destailleur
bf9313dd87 getBrowserInfo can return type of layout (classic/phone/tablet) 2014-07-27 20:56:26 +02:00
Laurent Destailleur
709bf20deb Work on prootype for using datatable. 2014-07-27 20:31:11 +02:00
Laurent Destailleur
b964f9e9e3 New: Add info page about browser. 
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
 2014-07-27 14:13:25 +02:00
Marcos García de La Fuente
37c7d05a9e Added missing return null for getStaticMember 2014-07-22 04:46:17 +02:00
Marcos García de La Fuente
31adeb7477 Deprecated getStaticMember 2014-07-22 04:12:45 +02:00
Marcos García de La Fuente
9b3e65d80f Removed PHP 5.3 comparison in dol_nl2br function 2014-07-22 04:07:33 +02:00
Laurent Destailleur
bd095f597d Fix: CheckStyle 2014-07-20 14:54:30 +02:00
Marcos García de La Fuente
55bfc98d48 Corrected dol_microtime_float refactor 2014-07-18 12:00:01 +02:00
Marcos García de La Fuente
214fe2d552 Optimized isValidEmail function and load json.lib.php always as it contains common Dolibarr functions 2014-07-18 11:18:25 +02:00
Marcos García de La Fuente
bcafa2c790 Corrected file_exists check and little refactor 2014-07-17 21:44:59 +02:00
Marcos García de La Fuente
8a17feb69b Deprecated some functions and improved method documentation 2014-07-15 17:35:12 +02:00
Marcos García de La Fuente
ad4512cb24 Avoiding include in case of unexisting file 2014-07-15 17:18:41 +02:00
Marcos García
8eced58ba0 Removed @ operator from dol_include_once 
Adding @ operator to include_once makes include errors untraceable, it shouldn't be there. Errors must be thrown so that we notice them. It is PHP configuration's choice to decide wether to log them or print them.
 2014-07-14 19:16:28 +02:00
Laurent Destailleur
8e2999f73f Fix: phpcs 2014-07-04 14:19:03 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
Juanjo Menent
24b2b83b85 use count() instead sizeof() 2014-07-03 18:55:03 +02:00
Juanjo Menent
e30649dcd2 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with company 2014-07-03 17:39:31 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any 
html.
 2014-06-21 01:26:41 +02:00
Laurent Destailleur
e2afa6853b Fix: Deletion of translation has disappeared. 2014-06-20 15:05:39 +02:00
Laurent Destailleur
3791175536 Fix: doxygen 2014-06-20 13:07:15 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
872e764c94 Fix: html detection was not working with hx tags. 2014-05-24 14:57:41 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Florian HENRY
2aa2f896c6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-09 13:28:45 +02:00
Florian HENRY
02e0fac79f "or" into if instead of || 2014-05-09 13:28:29 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Laurent Destailleur
1bc3558307 Fix: Better html detection 2014-05-07 19:06:15 +02:00
Laurent Destailleur
bcdf3e8a51 New: The combo list of juridical status is now sorted 2014-05-04 23:46:36 +02:00
Laurent Destailleur
7bb23086b8 Fix: Strict mode 2014-05-01 17:06:14 +02:00
Laurent Destailleur
e5c5b15ecc Qual: Start to clean module ECM (Code is to complex). Prepare for 
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
 2014-04-28 01:46:11 +02:00
Raphaël Doursenaud
036cc7472f Qual: Removed missing variable from function call 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
1c7011523d Qual: Missing global declaration 2014-04-23 18:24:00 +02:00
Raphaël Doursenaud
83dd3a532b Qual: Better type check 2014-04-23 18:23:50 +02:00
Laurent Destailleur
1c21c00fb6 New: Can use "Space" as value for SeparatorThousand into language files 2014-04-06 21:18:21 +02:00
Laurent Destailleur
d595b96c8e New: Paypal return for subscription show more information and direct 
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
 2014-04-06 14:22:08 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
61f649e1ae Fix: When select_date is called with '' as preselected date, 
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
 2014-03-29 04:26:44 +01:00
Laurent Destailleur
4d4512fadd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-26 22:14:14 +01:00
Laurent Destailleur
62a990d6cc Fix: ajax_combobox function must be included before called. 
New: Feature of module survey are now localized into top menu "Tools".
 2014-03-26 16:02:22 +01:00
Laurent Destailleur
ed7ffebea4 Code comment 2014-03-21 18:32:18 +01:00
Laurent Destailleur
24dbfbba60 Qual: Still working on cleaning code for timezone management. 2014-03-21 18:05:08 +01:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases. 
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
 2014-03-21 16:22:41 +01:00
Laurent Destailleur
b2f6498236 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-21 15:03:37 +01:00
Laurent Destailleur
7fb004903e Qual: Start to clean old code. 2014-03-21 15:02:27 +01:00
Laurent Destailleur
c1411e65b7 Fix: Try to add code to provide easy way to fix warning on timezone not 
defined.
 2014-03-21 10:13:29 +01:00
Laurent Destailleur
aabd923248 Try to remove warning 2014-03-21 09:49:10 +01:00
Laurent Destailleur
4bf822225e Look: info admin picto now use the info picto (the star were confused 
with the mandatory "star").
 2014-03-19 23:50:10 +01:00
Laurent Destailleur
7eea96c07c Minor fix into standing order. 2014-03-17 20:43:01 +01:00
Laurent Destailleur
14d8bfef3a New: Improved Opensurvey module: Description of survey use wysiwig 
editor, More information shown on result tab, Renamed "survey" into
"poll" (better translation).
 2014-03-17 12:40:12 +01:00
Laurent Destailleur
2d3c700a7d Fix: When cloning product, autogenerating barcode must not use same 
number.
Qual: Moved dedicated permission of module to "advance" permissions.
 2014-03-16 17:37:54 +01:00
Laurent Destailleur
998ecc3c15 Optimize code. 2014-03-01 15:59:09 +01:00
Marcos García de La Fuente
e963f55593 Corrected CS error 2014-02-25 13:34:33 +01:00
Marcos García de La Fuente
d69939b7b1 Function dol_clone is now a deprecated function 2014-02-25 04:29:09 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Laurent Destailleur
8c9d2418d2 Qual: Move common javascript function into lib_head.js 2014-02-19 11:08:43 +01:00
Laurent Destailleur
867c83680b Merge remote-tracking branch 'origin/3.5' into develop 2014-02-17 18:22:49 +01:00
Laurent Destailleur
1cfcda702e Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not 
work.
 2014-02-17 17:32:25 +01:00
Laurent Destailleur
57153e4de4 Try a cleaner javascript escape function. 2014-02-13 23:40:39 +01:00
Laurent Destailleur
aa69927089 Move table title nowrap tag at a better place. 2014-01-15 18:35:15 +01:00
Laurent Destailleur
02989b9f32 New: An external module can add tabs with a label that is a dynamic 
value.
Qual: The deprecated way (with 4 parameters) to declare a new tab into a
module descriptor file has been removed. You must now use the 6
parameters way. See file modMyModule.class.php for example.
 2014-01-12 14:11:03 +01:00
Laurent Destailleur
5bdd7fc074 Fix: Doxygen 2014-01-10 03:39:43 +01:00
Laurent Destailleur
7809e0baa9 Fix: dol_htmlentitiesbr behaviour was different if input was html 
or not. Add phpunit test to avoid that in future.
 2014-01-10 01:25:28 +01:00
Laurent Destailleur
6ff337ccad New: Add option 'aZ' into GETPOST function to check parameters 
contains only a to z or A to Z characters.
 2014-01-08 00:10:39 +01:00
Laurent Destailleur
0e3757aa5c New: Add option 'az' into GETPOST 2014-01-08 00:05:14 +01:00
Laurent Destailleur
eadccb5d9b Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/margins.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/lv_LV/admin.lang
	htdocs/langs/lv_LV/agenda.lang
	htdocs/langs/lv_LV/banks.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/lv_LV/boxes.lang
	htdocs/langs/lv_LV/opensurvey.lang
	htdocs/langs/lv_LV/users.lang
	htdocs/langs/ro_RO/admin.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/cron.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/help.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/margins.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/uz_UZ/main.lang
 2013-12-31 12:18:31 +01:00
Laurent Destailleur
e142bd252d Fix: disable code making jmobile crazy. 2013-12-31 10:48:15 +01:00
Laurent Destailleur
b35f44e3cb New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs 
when you use the "print" view on screen.
 2013-12-19 20:57:13 +01:00