Commit Graph

40223 Commits

Author SHA1 Message Date
geoffrey.girard
7f59def98b Correction trigger on update product buyprice 2014-01-22 10:44:23 +01:00
geoffrey.girard
8729790016 Add trigger on update product buyprice 2014-01-17 10:38:18 +01:00
geoffrey.girard
e418e10df0 Add new doActions hook on supplier prices page 2014-01-17 09:45:57 +01:00
Laurent Destailleur
f1a380f02b Merge pull request #1374 from altairis-fr/export_supplier_prices
Add supplier informations in product export (supplier name, supplier product ref and supplier unit price)
2014-01-16 07:19:46 -08:00
Christophe Battarel
0bdcd108f5 Add supplier informations in product export (supplier name, supplier product ref and supplier unit price) 2014-01-16 11:04:56 +01:00
Laurent Destailleur
c5bcc92651 Rename tag note to differentiate public and private note 2014-01-16 00:07:45 +01:00
Laurent Destailleur
f83044c5c5 Qual: Include migration script into continuous integration. 2014-01-15 21:35:49 +01:00
Laurent Destailleur
6f4e2dd9fc Qual: Include migration script into continuous integration. 2014-01-15 20:33:40 +01:00
Laurent Destailleur
38a7513fcc Qual: Include migration script into continuous integration. 2014-01-15 19:55:29 +01:00
Laurent Destailleur
b3229a4021 Qual: Add error message if using wrong parameter into upgrade.php script
First try to test migration into travis.
2014-01-15 19:23:33 +01:00
Laurent Destailleur
aa69927089 Move table title nowrap tag at a better place. 2014-01-15 18:35:15 +01:00
Laurent Destailleur
ad5fc43e5b doxygen 2014-01-15 18:20:24 +01:00
Laurent Destailleur
b5620d5f15 New: The box "balance of bank accounts" show all opened accounts. 2014-01-15 17:52:16 +01:00
Laurent Destailleur
fce9baddf0 New: Add substitution key into emailing module to include securitykey
used for paypal links into email.
2014-01-15 17:21:13 +01:00
Laurent Destailleur
3461b1932b Merge pull request #1378 from KreizIT/fix
Fix bug on stock calculation for replenishment: wrong order in ifsql.
2014-01-14 09:06:46 -08:00
Cedric GROSS
911c43c862 Fix bug on stock calculation for replenishment: wrong order in ifsql. 2014-01-13 19:46:23 +01:00
Laurent Destailleur
5f65b2a97f Merge remote-tracking branch 'origin/3.5' into develop 2014-01-12 20:23:24 +01:00
Laurent Destailleur
0f329e72ef Fix: MAIN_FORCETHEME was not working when user set its own theme 2014-01-12 20:22:35 +01:00
Laurent Destailleur
4d298b1891 Update code comments and add log warning to help debug 2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961 Update code comments and add log warning to help debug 2014-01-12 20:02:41 +01:00
Laurent Destailleur
ffeb2778e5 Fix: path to image must not be hardcoded but use dol_buildpath or
img_picto with param src=1.
2014-01-12 19:23:36 +01:00
Laurent Destailleur
51b455b85a Start to normalize code for category to not use named table, columns but
only type of category.
2014-01-12 15:54:28 +01:00
Laurent Destailleur
1cf058b8e9 Bad comment 2014-01-12 15:12:25 +01:00
BENKE Charles
28204d66b1 Update modFacture.class.php
remplace price by subprice on export invoice
2014-01-12 14:59:23 +01:00
Laurent Destailleur
77688100bd Merge pull request #1372 from defrance69/patch-23
Update modFacture.class.php
2014-01-12 05:58:04 -08:00
Laurent Destailleur
c3360c4c30 Fix: Bad merge 2014-01-12 14:51:54 +01:00
Laurent Destailleur
06aa3b8250 Merge branch 'opensurvey-improvements' of
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements

Conflicts:
	ChangeLog
2014-01-12 14:50:00 +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
eaf3bd5679 Update doc 2014-01-11 13:34:39 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
171e74ae7e Reduce time to hide/show 2014-01-11 13:31:12 +01:00
BENKE Charles
dd3da37ce6 Update modFacture.class.php
remplace price by subprice on export invoice
2014-01-10 10:35:42 +01:00
Laurent Destailleur
5bdd7fc074 Fix: Doxygen 2014-01-10 03:39:43 +01:00
Laurent Destailleur
45b3a02e8b Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-01-10 01:37:58 +01:00
Laurent Destailleur
2c310e26a6 Fix: Missing lang file 2014-01-10 01:37:41 +01:00
Laurent Destailleur
9b9492a5d6 New: Start to work on option MAIN_AUTO_TIMESTAMP_IN_NOTES to
automatically add timestamp and user line into comment. Remain to do:
Add button "cancel" into note edition mode.
2014-01-10 01:31:23 +01:00
Laurent Destailleur
c3da8ca80a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-10 01:25:55 +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
7b63ce1f31 Doxygen 2014-01-10 00:57:17 +01:00
Laurent Destailleur
0b071ac4f1 Merge pull request #1369 from jfefe/fix_extrafield_list
Fix : when using several field for label into sellist extrafields
2014-01-09 06:41:27 -08:00
Laurent Destailleur
08e4dc29de Merge pull request #1370 from jfefe/ajax_extralist
New : ajax list for extrafields list and sellist
2014-01-09 06:39:22 -08:00
Laurent Destailleur
dce76609e3 Merge pull request #1365 from marcosgdf/translation
Added missing translation key
2014-01-09 06:33:02 -08:00
Laurent Destailleur
433a6c0e76 Merge pull request #1364 from marcosgdf/xss-title
Fixed XSS problem in title tag
2014-01-09 06:32:35 -08:00
Laurent Destailleur
d76f54757b Merge pull request #1367 from camlafit/odt2pdf
Small improves on odt2pdf script
2014-01-09 06:31:35 -08:00
Laurent Destailleur
511a44a7e6 Merge pull request #1368 from csalvador/webservices-debug
fixed wrong thumbnails directory
2014-01-09 06:28:53 -08:00
Cédric Salvador
e959568a1d Added details to the contact created by create_individual 2014-01-09 09:10:50 +01:00
jfefe
77a1d6a43a Bad value display when using several label into sellist extrafield 2014-01-09 02:40:34 +01:00
jfefe
f554464690 New : ajax list for extrafields list and sellist 2014-01-09 02:10:03 +01:00
jfefe
f1d1522478 Fix : when using several field for label into sellist extrafields traduction is not needed.
Without this, the list display "not defined". The key can't exists because label displayed is build from several field so we show raw data
2014-01-09 01:49:59 +01:00
Laurent Destailleur
63ecb859d6 Fix: Missing alias befofe field into sql request and removed bad join on
table making some record to disappear.
2014-01-08 20:50:04 +01:00