Commit Graph

1393 Commits

Author SHA1 Message Date
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page
Fix Missing translations
2015-12-21 00:47:44 +01:00
cla
cb96618460 Merge branch 'develop' into develop_sunimport 2015-12-18 10:49:57 +01:00
cla
ef487c48a4 NEW
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
2015-12-16 16:18:29 +01:00
Laurent Destailleur
dc6ec91b2c Merge pull request #4183 from IonAgorria/patch-3
JS error preventing hiding of dates at object line
2015-12-13 19:57:37 +01:00
Ion Agorria
26b85d7cac Remove unnecesary variable 2015-12-11 18:28:55 +01:00
Ion Agorria
f34fb0d82d More consistent check 2015-12-11 03:09:09 +01:00
Raphaël Doursenaud
3e2309d0e6 NEW Factorized price2numjs into lib_head.js.php
Used public domain code from the MDN to provide a robust decimal
rounding implementation.

Warning for developers: the path of the javascript file has changed.
Please update your scripts.
2015-12-10 17:03:00 +01:00
Ion Agorria
ceb2920769 Better undefined CKEDITOR fix 2015-12-10 14:17:08 +01:00
Ion Agorria
bbfd138896 Missed another CKEDITOR ref 2015-12-09 18:00:05 +01:00
Ion Agorria
238f977002 JS error preventing hiding of dates at object line
The "if (CKEDITOR)" gives "ReferenceError: CKEDITOR is not defined" at JS console causing the next code to don't execute, is this code obsolete?
2015-12-08 15:45:24 +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
Raphaël Doursenaud
2cf36d157f 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:24:24 +01:00
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +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
Laurent Destailleur
cb3765bc92 Debug module Resource 2015-11-22 12:23:10 +01:00
philippe grand
55bab28b9c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-21 17:15:56 +01:00
Laurent Destailleur
548ff26628 Focus on textarea works also when ckeditor is on 2015-11-21 13:42:01 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
philippe grand
928c44b04f Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-21 04:52:19 +01:00
Florian HENRY
4ff0c22e29 continue extrafield ID filter 2015-11-20 13:22:45 +01:00
philippe grand
4f280f63d0 [Qual] Uniformize code 2015-11-19 13:59:58 +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
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +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
682842f15f Fix into title of login page, we must report the tru dolibarr version
after the @ (technical information), event if application name/version
was replaced with a constant.
2015-11-13 10:37:51 +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
7ebe032d6f FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
Close #3865
2015-11-08 16:01:12 +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
Marcos García de La Fuente
8ccb8c92e0 FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
Close #3897
2015-11-07 14:29:38 +01:00
Laurent Destailleur
04664c203d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
2015-11-05 22:13:08 +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
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
2015-11-05 01:50:30 +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
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +01:00
Sergio Sanchis Climent
4fd0086862 Fix: error this.price > 0
if no parse this.price when compare this.price and 0 always false
2015-10-26 11:33:43 +01:00
Laurent Destailleur
8306d93286 NEW Add css on column of detail lines to allow module to easily
manipulate fields.
2015-10-20 16:08:25 +02:00
Laurent Destailleur
0c6441df74 FIX Using extrafield with type "Link to object" works correctly. 2015-10-20 12:40:37 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must
include a print before. It is no more included into function.
2015-10-17 02:01:13 +02:00
Laurent Destailleur
b43047bc2f Use the new banner on all tabs of contacts 2015-10-15 14:13:31 +02:00
Laurent Destailleur
a84ec64ece The new banner tab is available on all tabs of thirdparty. 2015-10-13 13:06:32 +02:00
Laurent Destailleur
0ba6bdb7c2 CSS enhancement 2015-10-11 13:26:22 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
378da082bd Fix selector or margin with jmobile 2015-09-18 20:43:10 +02:00