Laurent Destailleur
8342a61ea9
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/fourn/facture/card.php
htdocs/product/composition/card.php
2016-04-12 15:00:02 +02:00
Laurent Destailleur
6a4ca98ad9
Merge pull request #4908 from altatof/fix_bad_rounding
...
FIX: systematic rounding causes prices to be updated without reason
2016-04-04 00:18:18 +02:00
Christophe Battarel
024f55d461
FIX: systematic rounding causes prices to be updated without reason
2016-03-29 12:02:36 +02:00
Laurent Destailleur
cbd01bae49
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
2016-01-22 03:18:51 +01:00
Laurent Destailleur
801e2bca4b
Fix #4239
2016-01-10 18:42:35 +01:00
Laurent Destailleur
cdaccf7c4b
Fix: markRate can be 100
2016-01-10 18:28:50 +01:00
Raphaël Doursenaud
3f9efc537b
FIX #3953 Don't round supplier price
...
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
2015-12-07 14:35:04 +01:00
fappels
4a0ea97772
FIX #3953 rounding of buying price
...
fix javascript for rounding of buying price
2015-11-29 15:34:43 +01:00
fmarcet
0cbf8ca1dd
FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO
...
variable is empty or not
2015-11-18 13:59:25 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
98c32fa1ec
FIX The label hidden was not supported when using jmobile
2015-11-10 00:36:33 +01:00
Marcos García de La Fuente
84a152dc2e
FIX #3836 Unable to upload a document to an invoice under some circunstances
2015-11-07 15:33:48 +01:00
Laurent Destailleur
58cac2d895
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Raphaël Doursenaud
b0cf9bd0be
Fix #3864 Really fixed invalid jQuery code
2015-11-05 14:38:11 +01:00
Laurent Destailleur
77371af35a
FIX #3661 Margin is not selected correctly when adding a product
2015-11-05 01:08:30 +01:00
Raphaël Doursenaud
69ac75bef8
Fix #3864 Fixed invalid jQuery code
2015-11-04 22:55:14 +01:00
Laurent Destailleur
f928062e2b
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
2015-11-02 17:56:32 +01:00
Laurent Destailleur
378da082bd
Fix selector or margin with jmobile
2015-09-18 20:43:10 +02:00
Laurent Destailleur
313d9ddacd
FIX #3534
2015-09-16 22:04:03 +02:00
Laurent Destailleur
822d4d1b39
Fix remove log
2015-09-06 15:06:13 +02:00
Laurent Destailleur
aaa639a3ab
Fix error when mark rate is 100% and buying price is 0, no way to
...
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
2015-09-06 15:00:17 +02:00
Laurent Destailleur
278e90cf0a
Fix same pb than #3297 with vat edit
2015-08-31 13:06:53 +02:00
Juanjo Menent
25fca6615a
Merge pull request #3395 from fmarcet/develop
...
NEW: Translate extrafield's labels
2015-08-28 16:44:49 +02:00
Laurent Destailleur
c3fb14855b
Try a better fix to replace PR #3297
2015-08-20 14:34:48 +02:00
Laurent Destailleur
26e3fcc636
Try a better fix to replace PR #3297
2015-08-20 03:38:21 +02:00
fmarcet
d6b84233ed
NEW: Translate extrafield's labels
2015-08-18 16:40:03 +02:00
Laurent Destailleur
f3c4e20db2
Fix centering of message on logon page
2015-08-15 03:41:57 +02:00
Laurent Destailleur
6c01403ef3
Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr
...
into IonAgorria-resources-fixes
Conflicts:
htdocs/core/tpl/resource_add.tpl.php
htdocs/resource/element_resource.php
2015-08-14 17:53:52 +02:00
Laurent Destailleur
2abb90713e
Fix list of resource not visible
2015-08-14 17:35:05 +02:00
Ion Agorria
2e1e9017c6
Missed the file
2015-08-12 22:00:51 +02:00
Juanjo Menent
95e8148f78
Merge pull request #3294 from GPCsolutions/totalvalidator
...
Totalvalidator
2015-08-10 20:56:31 +02:00
Laurent Destailleur
5cea60cf58
Default price for margin was not set
2015-07-28 19:39:42 +02:00
Raphaël Doursenaud
eecc0c14b3
Qual: prefer title to summary for tables
...
Summary is being deprecated in HTML5
2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
fea3957734
Qual: use CSS centering
2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
95ca9cef75
Qual: use CSS vertical alignment
2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
f63f66d681
Qual: prefer CSS centering
2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
bd937070d2
Accessibility: added login form hidden labels
2015-07-24 11:41:22 +02:00
Raphaël Doursenaud
7398104f33
Qual: Ignore logo by assistive technology.
...
http://www.w3.org/TR/WCAG20-TECHS/H67.html
2015-07-24 11:40:24 +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
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
Marcos García de La Fuente
cba902c5ae
Fix: [ bug #3055 ] Product image thumbnails were not deleted after deleting the image
...
Close #3055
2015-07-07 09:40:23 +02:00
aspangaro
e363b20e85
Forms are using the tab look, even in creation mode
2015-06-30 06:31:09 +02:00
Regis Houssin
c05bf7e977
New: Possibility to add javascript in main login page with
...
"getLoginPageOptions" hook
2015-06-26 19:37:37 +02:00
Laurent Destailleur
1485ead215
Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate
...
option to get same behaviour.
2015-06-24 21:36:28 +02:00
Marcos García de La Fuente
1e05262884
Corrected Timezone detection by using jstz external library
2015-06-16 21:19:58 +02:00
Laurent Destailleur
87e07a3038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
2015-06-14 17:18:45 +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
Marcos García de La Fuente
6514f418e5
Fix [ bug 1852 ] JS error when editing a customer order line
2015-06-13 11:46:35 +02:00
Marcos García de La Fuente
ea625628ce
Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers
2015-06-13 03:39:06 +02:00
