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

2232 Commits

Author SHA1 Message Date
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
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Laurent Destailleur
313d9ddacd FIX #3534 2015-09-16 22:04:03 +02:00
Laurent Destailleur
91ddca6ab0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-09-06 16:34:40 +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
7c2b6e7780 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 14:55:29 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
Laurent Destailleur
6a9933d9af Update doc 2015-09-05 10:49:55 +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
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
 2015-06-08 18:28:50 +02:00
Laurent Destailleur
e9526066b7 Prepare edition of field "bydefaultinlist" for extrafields. 2015-06-08 14:12:57 +02:00
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034-Original filename""
 2015-06-06 13:03:02 +02:00
Laurent Destailleur
49f2157f2d Little debug of module resource 2015-05-31 02:05:39 +02:00
Laurent Destailleur
65c7ab7a93 Fix: Introduce error by default when function is used as a true delete 
function.
 2015-05-29 17:11:42 +02:00
Laurent Destailleur
6f5a30638c NEW On page to see/edit contact of an ojbect, the status of contact is 
visible (for both external and internal users).
 2015-05-22 12:21:36 +02:00
Laurent Destailleur
4408648a68 Merge pull request #2817 from GPCsolutions/jqueryfixes 
jQuery fixes
 2015-05-12 22:36:12 +02:00
Raphaël Doursenaud
aee61aa2c4 [Qual] Fixed deprecated HTML nowrap attribute to class 2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
ce60ae0fcc [Qual] Fixed HTML readonly attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The readonly attribute is boolean.
 2015-05-12 15:09:26 +02:00
Raphaël Doursenaud
e149d49fb8 [Qual] Use jQuery property instead of attribute to test and set disabled 2015-05-12 14:53:01 +02:00
Raphaël Doursenaud
0d8641a073 [Qual] Use jQuery property instead of attribute to test and set checked 2015-05-12 14:51:30 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Laurent Destailleur
4e04f75c66 Fix css 2015-04-27 02:33:44 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
2967bc7df7 Merge branch 'develop' into units 2015-04-19 17:19:59 +02:00
Marcos García de La Fuente
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00
Maxime Kohlhaas
e692950627 Fix : multi upload of files in document tabs 2015-04-19 04:04:43 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Maxime Kohlhaas
c3bcda74f3 Fix : unit price without tax is now subprice (not pu_ht) 2015-04-18 19:17:05 +02:00
Laurent Destailleur
e1403b136c Merge pull request #2639 from aternatik/stable_resource 
New : mark resource module as stable
 2015-04-18 18:48:24 +02:00
jfefe
f2e19f2326 Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
ce81f58986 Fix several bugs into edit of supplier lines 2015-04-18 16:54:00 +02:00
Maxime Kohlhaas
3073aab48b Fix : discount were not working anymore on supplier order and bill 2015-04-17 23:31:51 +02:00
Laurent Destailleur
5dc1102601 Fix object not defined 2015-04-13 13:34:13 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
44f10ebec2 Fix: do not add new value 2015-04-13 13:01:23 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Laurent Destailleur
69eaa032bf Merge remote-tracking branch 'origin/3.7' into develop 2015-04-03 01:10:55 +02:00
Laurent Destailleur
98b1d6170d Fix style fieldrequired must be used only in create/edit mode. 2015-04-03 01:07:17 +02:00
Laurent Destailleur
b83e9ea32f Merge branch 'loan' of https://github.com/frederic34/dolibarr into 
frederic34-loan

Conflicts:
	htdocs/compta/bank/ligne.php
 2015-03-30 02:56:26 +02:00
Marcos García de La Fuente
3d50b41b8e Reverted $rowid instead of $id property 2015-03-23 01:40:33 +01:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
1a1959b52c Fix: Solve conflict with imgup and imgdown class use for sort fields and 
to drag and drop lines.
 2015-03-22 21:18:25 +01:00
Laurent Destailleur
2d90256640 Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04 Merge pull request #2456 from marcosgdf/refactor-1 
Refactor 1
 2015-03-22 12:47:05 +01:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
 2015-03-22 12:10:39 +01:00
Laurent Destailleur
b8ed553365 We must keep the @, some tools use it to know it is login page. 2015-03-21 01:08:29 +01:00
Laurent Destailleur
166fda4909 Normalize class names 2015-03-17 11:26:23 +01:00
Marcos García de La Fuente
086e439543 Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
 2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/includes/tcpdi/fpdf_tpl.php
 2015-03-15 18:07:30 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
BENKE Charles
9e62013bca Update admin_extrafields_edit.tpl.php 
add new type of extrafields : link
 2015-03-14 12:44:26 +01:00
BENKE Charles
4783db82ac Update admin_extrafields_add.tpl.php 
new type of extrafield : link
 2015-03-14 12:42:52 +01:00
Laurent Destailleur
687e3d250b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/fixdosfiles.sh
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-03-13 17:46:31 +01:00
Laurent Destailleur
a452823e1e Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility 
with 3.6
 2015-03-13 15:20:08 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
 2015-03-11 03:29:52 +01:00
Laurent Destailleur
548e720ca2 Uniformize code 2015-03-10 19:31:04 +01:00
Estephe L.
9d320e4268 Fix Anchor link for quick access when editing. 
This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
 2015-03-08 23:29:09 +01:00
Laurent Destailleur
a1567778ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/commande/card.php
 2015-03-06 18:51:55 +01:00
Laurent Destailleur
a169b3348e Fix show alays date fields for contract module. 
Fix select of product were lost.
 2015-03-06 14:36:22 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
174f1cb5f7 Refactored supplier invoice line view to fit commonobjectline view 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
b84cf4afac Renamed FactureFournisseurLine to SupplierInvoiceLine 2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
4c08d34bb5 Standardized $rowid as property 2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
b888a04af9 Reduce a lot of duplicate code. Move all tables of extrafields setup 
into a tpl file.
 2015-02-28 20:14:26 +01:00
Laurent Destailleur
4d226885cb Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 18:10:31 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
Laurent Destailleur
039a184d70 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-02-10 21:13:12 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
phf
f15d18dbb1 [CORE] ajout d'une colonne pour la référence fournisseur sur une demande de prix (#new_ask_price). 2015-02-03 15:21:10 +01:00
phf
5266542bc9 [CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price). 2015-02-02 17:50:33 +01:00
phf
d2c4e8c98f [CORE] retrait d'une condition ajout auparavant mais qui est inutile (#new_ask_price). 2015-02-02 16:18:07 +01:00
phf
4408828af4 [CORE] ajouts des conditions pour le fonctionnement avec le module (#new_ask_price). 2015-01-29 12:13:06 +01:00
phf
a58899d354 [CORE] ajout d'une condition pour le fonctionnement du module (#new_ask_price). 2015-01-29 10:41:08 +01:00
Christophe Battarel
04f83ae4ff FIX: always show fournprice select 2015-01-28 16:19:56 +01:00
phf
903f739449 [CORE] avancement du mercredi matin (#new_ask_price). 2015-01-28 10:33:15 +01:00
Florian HENRY
a510a1ef5c First step add contract lines extrafields 2015-01-27 12:53:02 +01:00
Florian HENRY
22c253cfc1 add extrafield type, check box from table 2015-01-18 16:02:31 +01:00
Marcos García de La Fuente
78905c6af1 Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
f92bc7986b Add Weighted average price as default price for buying price for margin 
calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace
with first supplier price.
 2015-01-14 10:46:50 +01:00
Laurent Destailleur
033e77c04a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-13 15:41:45 +01:00
Laurent Destailleur
8b3faf46db Add PMP into selection of buy price. 2015-01-13 15:38:59 +01:00
Laurent Destailleur
e4b89779f7 Fixed: css conflict 2015-01-10 21:39:40 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +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
40404530ba Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-25 12:09:00 +01:00
Marcos García de La Fuente
1179f722af Merge branch '3.7' into bug-1533 2014-12-25 01:26:00 +01:00
Laurent Destailleur
e8addcb8ba Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-23 12:25:21 +01:00
Marcos García de La Fuente
8a14409974 Fix: [ bug #1533 ] Links triggers do not show trigger error message 2014-12-23 11:39:43 +01:00
Laurent Destailleur
52b64f3441 CSS 2014-12-17 13:27:44 +01:00
Laurent Destailleur
a0112ba724 Better position of elements 2014-12-11 21:38:53 +01:00
Laurent Destailleur
4d7f3cb741 Fixed: Pb of wrapping login page 
New: Use placeholder
 2014-12-08 02:41:21 +01:00
Laurent Destailleur
d7dd496239 Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5 2014-12-08 00:09:01 +01:00
Laurent Destailleur
3186a8c23f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 12:07:53 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
 2014-12-04 15:29:45 +01:00
Laurent Destailleur
e90996b2de Merge pull request #2121 from frederic34/patch-10 
Fix missing </div>
 2014-12-03 12:21:29 +01:00
Frédéric FRANCE
ddee145c66 Update objectline_view.tpl.php 2014-11-30 20:28:41 +01:00
Frédéric FRANCE
f1fa7e720a Fix missing </div> 2014-11-30 18:33:00 +01:00
aspangaro
c27e2676e3 Modify presentation of login page 2014-11-29 07:08:35 +01:00
aspangaro
1c89186652 Merge remote-tracking branch 'Upstream/develop' into develop-html5 2014-11-28 06:20:01 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Laurent Destailleur
a81c483061 Revert "Update objectline_create.tpl.php" 
This reverts commit fdac53bfca.
 2014-11-28 02:14:25 +01:00
Laurent Destailleur
9ba5e9434d Fix: W3C a label must be used if there is an "input" field only. Also it 
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
 2014-11-28 02:05:40 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center 
Task 1603 - Remove <center> deprecated HTML5 tags
 2014-11-27 23:58:44 +01:00
aspangaro
b98c0a3208 Login - Better presentation with RWD 2014-11-27 20:32:29 +01:00
aspangaro
38d94bac33 Correct login page 2014-11-25 21:47:08 +01:00
aspangaro
559bf93acb Correct 2014-11-25 20:40:00 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
aspangaro
aa8c165f06 Presentation 2014-11-23 21:03:34 +01:00
BENKE Charles
fdac53bfca Update objectline_create.tpl.php 
add label tags for product mode type
 2014-11-19 18:53:33 +01:00
Laurent Destailleur
737dfab5b2 Fix: If error on add line of type "product" when creating 
proposal/order/invoice, do not show date of services.
 2014-11-16 19:12:05 +01:00
Laurent Destailleur
7177c04378 Minor css enhancement 2014-11-11 20:45:30 +01:00
Laurent Destailleur
8a89997c79 Fix: bug into edition of extrafields 2014-11-07 22:40:13 +01:00
Laurent Destailleur
3d5a45e274 Fix: textarea too small 2014-11-07 22:19:31 +01:00
Laurent Destailleur
9e92b469b9 Merge pull request #2005 from altairis-fr/hidemargininfos 
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
 2014-11-07 21:47:06 +01:00
Juanjo Menent
2f30e769f6 Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown 2014-11-06 22:16:27 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
80581b2908 Merge pull request #1978 from atm-maxime/3.6 
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
 2014-10-30 17:56:22 +01:00
Maxime Kohlhaas
efd99a6f44 Fix : extrafield errors 2014-10-27 10:20:35 +01:00
MAxime Kohlhaas
374b761fdf Fix : product list was wrong on supplier invoice because fourn_id is not fetched 2014-10-25 19:20:02 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Maxime Kohlhaas
452636b0e4 New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Maxime Kohlhaas
4fd67d725a Fix bug 1588 : relative discount not working anymore 2014-10-09 13:58:43 +02:00
Laurent Destailleur
168b0db094 Fix: button must be align to right 2014-10-08 15:09:07 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral 
background (nearest bootstrap). Remove image background.
 2014-10-03 01:48:14 +02:00
Laurent Destailleur
74cba062b4 Add a TODO to explain why we keep some extends into class. 
Should be removed once php min will be 5.4.
 2014-09-23 19:37:59 +02:00
Laurent Destailleur
08d4195504 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php
 2014-09-22 23:34:56 +02:00
Laurent Destailleur
f7f0059767 Missing hook to add button on intervention 
Prepare to move location into resource
Can select which king of contact show into contact tab.
 2014-09-22 20:16:58 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
154d1520fb Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1 2014-08-30 20:36:53 +02:00
Regis Houssin
a446318649 Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:32 +02:00
Regis Houssin
34561906fc Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:01 +02:00
Regis Houssin
76cb6f760a Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:02:13 +02:00
Laurent Destailleur
eb3c53d897 Merge pull request #1823 from Devensys/Develop-removeVersion 
Hidden version on login page
 2014-08-21 23:24:08 +02:00
Laurent Destailleur
c79fc516d3 Maj squelette 2014-08-14 17:27:28 +02:00
Andrelec1
1ffb964dd1 Change method 
Replace by existing constant ..
 2014-08-14 16:06:43 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Andrelec1
8b6d613cb0 Hidde version on login page 
Create option and use it in login template
 2014-08-12 12:29:20 +02:00
Laurent Destailleur
d801bcc690 Fix: When jmobile is forced, we force enable of javascript. 2014-08-08 14:37:51 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
a9779ca1ff Fix: bad colspan for line with date selector 2014-07-20 02:18:21 +02:00
Laurent Destailleur
04a20d2008 - New: Enable feature developed for 3.6 we forgot to enabled: Adding 
prefix on uploaded file names. 
- New: No more dependency between contract and service module.
 2014-07-19 22:05:35 +02:00
Laurent Destailleur
b42a33b203 Fix: For contract, only services available by default. Product appears 
if option is set only.
 2014-07-19 21:14:56 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
55d062784d Added labels on objectline form elements 2014-07-11 13:25:44 +02:00
Raphaël Doursenaud
b206ceea9e Added label for captcha 2014-07-10 16:46:10 +02:00
Raphaël Doursenaud
4a57a2adcd Added HTML5 autofocus attribute to login form 2014-07-10 16:34:19 +02:00
Laurent Destailleur
4dbc1dd1c6 Merge remote-tracking branch 'origin/3.6' into develop 2014-07-06 21:09:10 +02:00
Florian HENRY
b8c293fb16 $dateSelector is a paramters of formAddObjectLine, if use global it is 
reset to 0 because not declare in outer context but already exists in
the same context.
 2014-07-04 14:48:27 +02:00
Laurent Destailleur
29dfb71bbd Merge branch 'patch-11' of github.com:defrance69/dolibarr into 
defrance69-patch-11

Conflicts:
	htdocs/core/class/commonobject.class.php
 2014-06-26 23:04:26 +02:00
Laurent Destailleur
8d8ca154f1 Fix: For supplier order/invoice, deselect product when free line is 
selected.
 2014-06-09 14:58:58 +02:00
BENKE Charles
86e0d377f8 Update objectline_view.tpl.php 2014-05-19 09:40:06 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core 
Core integration of resource module
 2014-05-14 11:25:25 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +02:00
Laurent Destailleur
5fa05ee29d Start to clean code of templates to input lines 2014-05-12 12:53:10 +02:00
jfefe
12aafd219d Fix : update linked resource 2014-05-11 10:19:38 +02:00
jfefe
225c7ae07b New : link resource with any element 
With tpl system, external modules can declare resource with hook getElementResources
 2014-05-10 22:07:54 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Laurent Destailleur
3776f7b146 Fix: margin calculation from % when we enter a free product. 2014-05-10 20:10:59 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
7bb24969d8 Fix: [ bug #1372 ] Margin calculation does not work in proposals 2014-05-10 19:52:24 +02:00
Laurent Destailleur
01001592e6 Finished task to merge form of free product and predefined product. 2014-05-06 18:31:39 +02:00
Laurent Destailleur
dca53accaf Fix: translation 2014-05-05 18:30:07 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new 
product.
 2014-05-05 14:30:08 +02:00
Laurent Destailleur
8c7ff91341 Fix: Removed html5 warnings 2014-04-27 01:51:50 +02:00
Laurent Destailleur
8beaf30e88 Qual: Removed useless use of js 2014-04-27 01:51:31 +02:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Laurent Destailleur
561a1a1aac Fix: Miscellaneous problems on task tabs (withproject parameter lost and 
download fails).
 2014-03-14 02:07:54 +01:00
Laurent Destailleur
2a853329e5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php
 2014-03-08 14:25:59 +01:00
Laurent Destailleur
0a2a635755 Fix: td balance. 
Fix: New price was not used when editing a line when margin module was
on.
 2014-03-07 11:58:30 +01:00
Laurent Destailleur
827f7e898a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-27 10:50:27 +01:00
Laurent Destailleur
f7fe25e408 Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
63a2aa3365 Fix: sql error with postgres when creating extrafield with an upper cas 
character. code for new fields must be always lowercase.
 2014-02-25 15:48:13 +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
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This 
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
 2014-02-16 23:51:29 +01:00
Laurent Destailleur
935b30470d Fix: Missing nowrap 2014-02-16 20:09:25 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
85e93872b3 Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:42:43 +01:00
Laurent Destailleur
3aba53a9ae Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:26:41 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
b750e98d40 Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335 Fix: Missing vars and bar id. 2014-02-04 20:41:23 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/contact/class/contact.class.php
 2014-01-31 10:12:41 +01:00
BENKE Charles
a10ccb4d92 Update objectline_add.tpl.php 
Adding extra fields on line of element
 2014-01-29 16:45:37 +01:00
Laurent Destailleur
cd277aaf12 Fix: Missing translation 2014-01-26 19:10:05 +01:00
Laurent Destailleur
699a079ed7 New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and 
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
 2014-01-20 00:31:32 +01:00
Laurent Destailleur
123cd787f5 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-19 22:44:34 +01:00
Laurent Destailleur
79e4c283db Fix: Deletion of files was broken 2014-01-19 22:43:36 +01:00
Laurent Destailleur
c7a73e4e00 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 12:57:13 +01:00
Laurent Destailleur
22767bac36 Fix: Missing the version into url 2014-01-18 12:51:27 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
031fd2f8b8 Fix: No set focus 2014-01-17 03:25:31 +01:00
Laurent Destailleur
795dcad59f Fix: The login page should have same code than standard page using 
common footer.
 2014-01-12 22:26:48 +01:00
Laurent Destailleur
171e74ae7e Reduce time to hide/show 2014-01-11 13:31:12 +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
c7ef0b7c57 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/consumption.php
 2014-01-07 16:41:00 +01:00
Laurent Destailleur
667908baf8 Fix: Missing lang loading 2014-01-05 16:37:33 +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
6946fdbcda Merge remote-tracking branch 'origin/3.5' into develop 2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
 2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a Fix: Missing special code 2013-12-15 21:10:39 +01:00
Laurent Destailleur
3c87e1e20d Fix: no required class for not mandatory fields 2013-12-15 18:11:56 +01:00
Laurent Destailleur
eaf151d7f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
 2013-12-14 03:13:46 +01:00
Laurent Destailleur
6c7e173bba Fix: jmobile broken with css tagtable, tagtr and tagtd 2013-12-02 22:31:02 +01:00
Laurent Destailleur
0b9e8d6832 Fix: Alignement 2013-12-01 19:41:41 +01:00
Laurent Destailleur
e9e94b9e47 Fix: Alignement 2013-12-01 19:39:21 +01:00
Cédric Salvador
22d31817de made getVATRates synchronous to avoid concurrency problems 2013-11-29 12:13:23 +01:00
Cédric Salvador
ec3fc4e6e6 indentation 2013-11-28 15:53:28 +01:00
Cédric Salvador
2da88a2966 made getVATRates synchronous to avoid concurrency problems 2013-11-28 15:52:26 +01:00
Raphaël Doursenaud
302a230bf2 Made update price synchronous to avoid dependency hell 2013-11-21 18:00:27 +01:00
Laurent Destailleur
4356496ee8 Qual: File is not a class of a module 2013-11-18 00:20:05 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
Laurent Destailleur
45aac81b71 Doc: More comments 2013-11-16 18:12:13 +01:00
Laurent Destailleur
b3a1d695cd Qual: Better message for total of buying price 
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
 2013-11-15 11:43:16 +01:00
Laurent Destailleur
2e5320a532 Qual: Clean and uniformize code 2013-11-13 23:35:33 +01:00
Laurent Destailleur
cf3d6d410c Fix: Use correct css 2013-11-13 21:50:16 +01:00
Raphaël Doursenaud
81ecb4b4a5 Updated method call to new prototype 2013-11-06 10:26:09 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
c3108f452c copyrights 2013-11-06 10:20:11 +01:00
Cédric Salvador
b9c36e6e0a checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
f2535d74ea edit link lines function 2013-11-06 10:19:17 +01:00
Cédric Salvador
b158e8bb74 translations 2013-11-06 10:19:17 +01:00
Cédric Salvador
f19e5e86f4 don't try to create a link when the link input field is empty 2013-11-06 10:19:17 +01:00
Cédric Salvador
ce19b6da5c typo 2013-11-06 10:19:17 +01:00
Cédric Salvador
dcf051605a delete function for links 2013-11-06 10:19:16 +01:00
Cédric Salvador
c96b2d3b87 factorized form attach, documents list and links list for the document pages 2013-11-06 10:19:16 +01:00
Cédric Salvador
d47bb95b56 bugfix 2013-11-06 10:11:40 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Laurent Destailleur
fd168c1214 Doc comments 2013-11-04 15:04:04 +01:00
Laurent Destailleur
469dd03673 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/filefunc.inc.php
	htdocs/langs/nl_NL/margins.lang
 2013-11-01 17:58:38 +01:00
Christophe Battarel
ba0273ccc4 fix bad rounding on margin calculation and display 2013-10-30 18:17:37 +01:00
Laurent Destailleur
62bedffb49 Fix: Bad class for body 2013-10-27 02:10:53 +02:00
Laurent Destailleur
ec576c91cc Enhance prototype for tables 2013-10-21 13:43:31 +02:00
Regis Houssin
bc0f65b73c Fix: reorder lines problem 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2013-10-12 11:58:38 +02:00
Regis Houssin
8801d7a1eb Fix: reorder lines problem 2013-10-12 11:54:37 +02:00
Christophe Battarel
b197231c04 fix bad margin calculation for credit notes 2013-09-24 17:49:56 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Juanjo Menent
376b2812fe Merge pull request #1190 from altairis-fr/develop 
add ability to modify margin rate on line edit if authorized
 2013-08-23 00:18:08 -07:00
Christophe Battarel
4df216afbc add ability to define margin when adding line with new experimental form 2013-08-22 12:13:14 +02:00
Christophe Battarel
f37c24f8ff allow to modify margin rate or mark rate but not both 2013-08-22 11:45:27 +02:00
Christophe Battarel
e672783adb add ability to modify margin rate on line edit if authorized 2013-08-22 11:39:55 +02:00
Christophe Battarel
4c7741f5f0 manage user permissions for margin display 2013-08-20 12:11:19 +02:00
Christophe Battarel
06b8e939bd manage user permissions for margin rate 2013-08-20 12:04:01 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices 
more to come : same on edit, user permissions
 2013-08-12 15:34:09 +02:00
Laurent Destailleur
75e2350e6a Fix: Mutualizing code fix bug into duplicate code of contact management 
for project.
 2013-07-30 19:08:58 +02:00
Laurent Destailleur
843478317e Qual: Reduce CSS size by mutualizings styles. 2013-07-27 18:21:35 +02:00
Laurent Destailleur
14dfbfc40c Fix: W3C (form into tr make some browsers crazy) 2013-07-27 13:29:06 +02:00
Laurent Destailleur
2f25e07e5a Add class for body into login page 2013-07-27 11:53:15 +02:00
Laurent Destailleur
c174be7100 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8 Fix: Avoid duplicate div error. 2013-07-10 22:58:53 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
 2013-06-24 20:02:02 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
7fb8a740e7 Fix: bad function 2013-06-23 18:54:18 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
 2013-06-21 15:37:17 +02:00
Laurent Destailleur
253ce19bc1 Fix: Bad position of field 2013-06-21 15:26:46 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-06-14 19:56:07 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines 
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
 2013-06-10 16:05:41 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
e6c93424ce Qual: Normalized tabs 2013-05-29 15:41:59 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3 
fix bug : external users should not see costprice and margin infos
 2013-05-20 07:39:39 -07:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
simnandez
e2f2ad30ae Fix: Remove windows CR/LF 2013-05-18 09:15:18 +02:00
simnandez
2879a09a03 Fix: Remove windows CR/LF 2013-05-18 09:11:24 +02:00
Christophe Battarel
e3615d43bd fix bug : external users should not see costprice and margin infos 2013-05-17 15:02:27 +02:00
Laurent Destailleur
fdd8d2cc5e Fix: to large a href 2013-05-17 01:30:39 +02:00
Regis Houssin
047aa8ea29 Fix: avoid error when multiple files uploaded 2013-05-14 15:59:47 +02:00
Regis Houssin
d2aacdb04b Fix: avoid error when multiple files uploaded 2013-05-14 15:58:59 +02:00
Laurent Destailleur
03cbe6e208 Fix: Can't read link with some styles 2013-05-13 23:46:37 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning 
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
 2013-05-02 17:41:10 +02:00
Laurent Destailleur
26f3e920cf Fix: Removed warning. 
Fix: Missing doxygen
 2013-05-02 13:10:39 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2013-04-30 22:56:52 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
726c83d2d2 Merge pull request #877 from FHenry/develop 
Fix bug on Extrafield list table type
 2013-04-25 01:23:57 -07:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
9a0f9477a6 Fix multicompany problem with extrafield list from table 2013-04-25 00:01:38 +02:00
fhenry
7b1616d0c5 Better management extrafield from list of table 2013-04-24 19:14:03 +02:00
Laurent Destailleur
5d74f228d8 Removed version into trigger page (version on trigger is useless since 
trigger depend on module. Only version of module is required).
 2013-04-22 19:59:41 +02:00
Laurent Destailleur
e65e6516c5 Fix: Logon theme on amarok 2013-04-22 14:33:47 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
Regis Houssin
077698d789 Fix: for avoid missing the customer discount 2013-04-19 12:47:53 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
1a1e09a5ed Qual: Clean and mutualize code. 2013-04-13 18:33:23 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
5f2ea4c65c Merge pull request #804 from atm-maxime/develop 
Fixes on invoice payment list and for price by quantity
 2013-04-05 13:49:52 -07:00
Laurent Destailleur
1fb3159045 Qual: Uniformize code 2013-04-05 18:09:05 +02:00
Laurent Destailleur
77050340df Fix: Do not loose value dol_use_jmobile when using not connected pages 
(support and forget password)
 2013-04-05 17:50:45 +02:00
Laurent Destailleur
58277b0fff Look: Replace table with div 2013-04-05 17:39:27 +02:00
Maxime Kohlhaas
9530e103e8 Fix : price by quantity now updates the discount field only if there is not an existing discount greater than the price by quantity one 2013-04-04 20:44:00 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme. 
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
 2013-04-03 15:20:56 +02:00
fhenry
735e107a51 Better error management on extrafailed input 2013-04-02 14:12:21 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
jfefe
b36b776f10 IKM : work on new extrafield separator type 2013-03-15 23:39:18 +01:00
jfefe
b1d50e3f7f Move extrafield type select list on top of form 2013-03-15 18:56:44 +01:00
Laurent Destailleur
e748f07806 Qual: Using divs instead of tables 2013-02-25 10:31:47 +01:00
Laurent Destailleur
234e171e9d New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page. 2013-02-24 18:16:26 +01:00
Laurent Destailleur
3baf8a6c00 New: Use div instead of tables into login page. 2013-02-24 14:57:49 +01:00
Laurent Destailleur
c62f87380c Qual: use div instead of table 2013-02-24 02:41:46 +01:00
Regis Houssin
20522148f2 Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:06:45 +01:00
Regis Houssin
289ff4fe1a Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:03:20 +01:00
jfefe
3d8197ce4b Work on extrafields : position management & new type : select list 2013-02-15 11:19:49 +01:00
jfefe
14f21bc9f1 Add select list in extrafields type 2013-02-15 00:17:42 +01:00
Laurent Destailleur
82dda5723b Fix: Disable autocomplete 2013-02-12 01:29:26 +01:00
Laurent Destailleur
8682d3c928 Fix: Note not visible 2013-01-24 12:16:00 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
fhenry
51098c1227 Add standard extrafield type : 
- mail
	- phone
	- price
 2013-01-14 16:13:09 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
fhenry
d39368fd36 Add boolean (checkbox) standard extrafield feature 2013-01-12 14:02:39 +01:00
Christophe Battarel
62ccb57857 fix missing td 2013-01-11 15:41:47 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
012ee020a4 Fix: Bad label 2012-12-28 15:48:20 +01:00
Laurent Destailleur
8436f0666d Fix: [ bug #252 ] Contrat : pas d'éditeur WYSIWYG 
Fix: Margins information must be visible for orders, proposals and
invoices only.
Fix: Delete button for contracts not visible
 2012-12-28 11:36:31 +01:00
Laurent Destailleur
3858085a7f Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" 
onto logon page.
 2012-12-06 17:59:37 +01:00
Maxime Kohlhaas
e45438994c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-01 14:36:51 +01:00
Laurent Destailleur
4480af348c Fix: Cols at wrong place 2012-11-26 11:57:20 +01:00
Laurent Destailleur
b4ebd7e852 Qual: Uniformize code and fix a regression 2012-11-26 11:36:45 +01:00
Maxime Kohlhaas
9e4cba13c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-22 15:24:10 +01:00
Regis Houssin
a3d9b5788c Fix: use keyup instead change to avoid loosing the product id 
Fix: strict mode
 2012-11-20 12:09:52 +01:00
Maxime Kohlhaas
ec37a5e005 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-19 13:31:23 +01:00
Laurent Destailleur
19b7cc66d5 Qual: Remove hidden option so is not efficient and not used files. 
Qual: Uniformize code
 2012-11-17 11:48:51 +01:00
Maxime Kohlhaas
bed17951b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-27 15:59:40 +02:00
Maxime Kohlhaas
0f1617c31d Task 559 : add use of price by qty in product selection (select and ajax search) 2012-10-26 01:00:03 +02:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Regis Houssin
4f45ba8ff6 Fix: remove br 2012-10-24 09:56:31 +02:00
Laurent Destailleur
9589b84a1a Fix: No reason to start content of a cell with br 2012-10-22 19:30:49 +02:00
Regis Houssin
9bbea4f385 Fix: use span is better 2012-10-22 17:06:27 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Maxime Kohlhaas
16f82216bf Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low 2012-10-04 16:26:33 +02:00
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode 
Fix: strict mode bubbles
 2012-09-27 11:57:46 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Regis Houssin
98b38628c5 Fix: optimizing 2012-09-19 17:24:40 +02:00
Laurent Destailleur
8b7342f0ea New: Project notes use the note.tpl templates 2012-09-19 16:03:17 +02:00
Laurent Destailleur
9bc0011290 Merge pull request #405 from cbattarel/develop 
correct some ajax bugs caused by tpl recent updates
 2012-09-19 05:53:29 -07:00
Christophe Battarel
de93c819f4 correct some ajax bugs caused by tpl recent updates 2012-09-19 12:02:06 +02:00
Regis Houssin
16ad953d10 Fix: best practice 2012-09-17 08:13:29 +02:00
Regis Houssin
bf008c7640 Fix: optimizing 2012-09-17 06:43:58 +02:00
Laurent Destailleur
3953be53a7 Qual: Mutualize code 
New: Can use extrafields on contacts/addresses.
 2012-09-17 01:39:30 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Laurent Destailleur
9147911ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2012-09-15 13:53:19 +02:00
Laurent Destailleur
4566595d44 Fix: W3C when module margin is on 2012-09-15 13:44:40 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
d2e336ddd6 Fix: GET and POST treatment in dol_loginfunction() 2012-09-08 15:16:27 +02:00
Laurent Destailleur
5641a451d5 Revert "Fix: GETPOST is already in method" 
This reverts commit ce26a3cc81.
 2012-09-08 13:33:48 +02:00
Regis Houssin
ce26a3cc81 Fix: GETPOST is already in method 2012-09-08 13:24:10 +02:00
Laurent Destailleur
00ceaf9fac Sec: XSS hole 2012-09-08 13:19:54 +02:00
Laurent Destailleur
d0528740c2 Fix: We must not show date range for a product line type (only 
service line)
 2012-09-08 01:02:54 +02:00
Laurent Destailleur
7c27cfa88e Fix: br at wrong place (a different fix that should be ok in all cases) 2012-09-08 00:58:14 +02:00
Regis Houssin
c98e456ba9 Fix: missing <br> and strict mode 2012-09-07 18:16:05 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Regis Houssin
928aae7f79 Fix: strict mode day 2012-09-07 11:40:59 +02:00
Laurent Destailleur
eb3a262289 Fix: br at wrong place 2012-09-07 10:03:25 +02:00
Regis Houssin
ac5e201829 Fix: compatibility between bureau2crea theme and multicompany module 2012-09-02 11:40:20 +02:00
Regis Houssin
63564f8d50 Fix: broken features 2012-09-02 09:27:06 +02:00
Regis Houssin
c9886fb86d Fix: same size of view lines 2012-08-31 16:50:46 +02:00
Regis Houssin
f81b696890 Fix: code optimization 2012-08-31 09:25:27 +02:00
Marcos García
bb99e4d40d Fixed a problem when adding line into proposal 2012-08-31 07:49:00 +02:00
Regis Houssin
9a6ddbe096 Fix: use $mysoc instead customer 2012-08-30 22:14:18 +02:00
Regis Houssin
e84f57e62c Fix: restore broken features 2012-08-30 21:37:37 +02:00
Laurent Destailleur
c7e7b67433 Fix: bad default vat calculation 2012-08-30 21:16:41 +02:00
Regis Houssin
8f21abfc5a Fix: Disabled if customer is not subject to VAT 2012-08-30 19:01:48 +02:00
Regis Houssin
88742e41d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-30 11:10:53 +02:00
Regis Houssin
95c2650160 Fix: best method 2012-08-30 11:10:17 +02:00
Laurent Destailleur
bd5acde0c7 Add tag to detect new method (to help debugs) 2012-08-29 19:03:58 +02:00
Regis Houssin
ffd6c07003 Fix: remove obsolete code 2012-08-29 18:14:20 +02:00
Regis Houssin
13d46da3fe Fix: clear old data before update 2012-08-29 18:01:00 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Regis Houssin
6bdba9fa72 Fix: get the good vat rates 2012-08-29 11:55:53 +02:00
Regis Houssin
70c467e429 Fix: Update vat rate combobox 2012-08-29 08:17:25 +02:00
Laurent Destailleur
bd05056616 Fix: Missing br removed from select_produits 2012-08-28 22:25:58 +02:00
Laurent Destailleur
32ca894952 Try a fix for js syntax error 2012-08-28 22:05:40 +02:00
Regis Houssin
c0bde33b1f Fix: [ task #498 ] add same tests in edit mode 2012-08-28 16:11:40 +02:00
Regis Houssin
ce9a16b341 Fix: button add not disabled 2012-08-28 14:42:46 +02:00
Regis Houssin
4332c341bf Fix: check if textarea is not empty for free lines 2012-08-28 12:36:35 +02:00
Regis Houssin
e55c86074e Fix: compatibility with combobox 2012-08-27 21:45:19 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Regis Houssin
7ca0aa8a78 Fix: restore deprecated files 2012-08-27 17:23:35 +02:00
Regis Houssin
07a10d3984 Fix: add compatibility with old static combobox 2012-08-27 17:18:46 +02:00
Laurent Destailleur
b57de4fbac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 14:11:58 +02:00
Laurent Destailleur
1255699791 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 14:11:17 +02:00
Regis Houssin
6426ef3f8d Fix: add test for instance 2012-08-27 14:08:59 +02:00
Laurent Destailleur
625f53a708 Fix 4: test on selected value was lenght > 0 but if value is 0, lenght 
is 1 and we want flase here.
Fix 5: Button Add is enabled once a predefined product is selected.
 2012-08-27 13:54:14 +02:00
Regis Houssin
fb866d9106 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 13:33:31 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Laurent Destailleur
0bdb9aac31 Fix condition of usage of ckeditor 2012-08-27 13:07:25 +02:00
Regis Houssin
efa471b12b Fix: test if ckeditor is enabled 2012-08-26 21:47:56 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Regis Houssin
b4e324a515 Fix: add ht and ttc fields 2012-08-18 19:05:59 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
Regis Houssin
e1c009fce4 Fix: regression, formconfirm template can't use with variable content 2012-08-16 17:22:00 +02:00
Stephen L
c1d15a9572 Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 15:50:45 +02:00
Laurent Destailleur
3af27d17ab Add param to force to hide menu from login page 2012-08-05 21:14:17 +02:00
Regis Houssin
46511de913 Fix: remove unused code for avoid warning with IE9 2012-08-04 13:49:04 +02:00
Regis Houssin
beedf13324 Fix: restore broken feature, disable token renewal in ajax response 2012-07-29 09:54:58 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Christophe Battarel
34022de1de correction of syntax error in tpl 2012-07-18 16:43:02 +02:00
Christophe Battarel
50c2a65b6a add margin infos to templates 2012-07-18 16:01:54 +02:00
Christophe Battarel
1de9dc15bf add margin module 2012-07-18 15:52:15 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
4291db4a93 Fix: strict mode 2012-07-10 18:57:27 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
158930eb7b Fix: function is loaded once and not overwritten if loaded 
by another ajax page. So if we need inputok/ko and pageyes/no to be
different according to ajax calls (to have several confirm box
loaded from different ajax parts of page, we must place such variables
outside of function. For this $useglobalvars must be set to 1.
 2012-06-08 23:48:53 +02:00
Laurent Destailleur
85f31fc0cb Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-08 20:37:14 +02:00
Regis Houssin
bd6f5c4ca7 Fix: use template for best visibility 2012-06-08 18:03:00 +02:00
Regis Houssin
1fc102825a Fix: bad option name 2012-06-08 11:47:34 +02:00
Regis Houssin
92b02a0084 Fix: add iframe transport for compatibility with all browser 2012-06-08 11:35:32 +02:00
Laurent Destailleur
8a4a74a1bf Look: Add more space 2012-06-07 20:58:26 +02:00
Regis Houssin
2ad1cf0665 Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:11:36 +02:00
Regis Houssin
248f0e9d08 Fix: reload page after file upload completed 2012-05-30 23:14:35 +02:00
Regis Houssin
6c5237f94e Fix: add max file size 2012-05-30 22:44:44 +02:00
Regis Houssin
1ea7e53273 Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 11:57:00 +02:00
Laurent Destailleur
e0b6bee540 New: Add timezone string from browser. 2012-05-15 01:41:12 +02:00
Raphaël Doursenaud
6fd60ff174 Fix: Typo 2012-05-07 18:27:23 +02:00
Laurent Destailleur
74b115877d Fix: Middle 2012-05-02 10:19:42 +02:00
Laurent Destailleur
3afbd182b4 Fix: Missing css style 2012-04-21 12:30:39 +02:00
Laurent Destailleur
658911b8c9 Qual: Move embeded style into css files. Add more styles. 2012-04-18 14:27:31 +02:00
Regis Houssin
1c2f192dd6 Fix: add customer_ref in propal list and clean code 2012-04-06 11:38:13 +02:00
Laurent Destailleur
b583e71552 Look: Increase tab size. Reduce size of css. Removed a non pretty line. 2012-03-19 18:54:12 +01:00
Laurent Destailleur
fe9b244a38 Fix: Removed HTML5 warnings 2012-03-18 23:42:53 +01:00
Regis Houssin
370979f6c6 Fix: for compatibility 2012-03-18 14:40:42 +01:00
Regis Houssin
7f7ef8da1e Fix: this parameter is used by editInPlace() method for define the save 
method
 2012-03-18 14:10:04 +01:00
Regis Houssin
cfd72a5f73 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-18 14:07:07 +01:00
Regis Houssin
808c4b5732 New: testing a new method to avoid reloading the page 2012-03-18 14:06:55 +01:00
Laurent Destailleur
b0d319eaf7 Update code comments. 
TODO: What is the goal of field 5 in
ckeditor:dolibarr_zzz:width:height:?:1:rows:cols
 2012-03-18 12:48:07 +01:00
Regis Houssin
3cdff5361f Fix: add empty message in combobox 2012-03-18 12:18:23 +01:00
Regis Houssin
d752e25946 New: add new notes system in contract and order/invoice supplier module 2012-03-18 11:13:01 +01:00
Laurent Destailleur
59bef9caa1 Qual: Uniformize code to use new note system. 2012-03-18 02:01:23 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Laurent Destailleur
8d1b9055b4 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/notes.tpl.php
 2012-03-17 23:32:28 +01:00
Laurent Destailleur
21a1d47130 New: Can define if ckeditor is opened or not in editval 
New: Can use a width of 100% in ckeditor
 2012-03-17 23:27:53 +01:00
Laurent Destailleur
4c2da4f5fa New: Can define if ckeditor is opened or not in editval 
New: Can use a width of 100% in ckeditor
 2012-03-17 23:11:25 +01:00
Regis Houssin
815ee68f8f Fix: use div instead table 2012-03-17 18:10:59 +01:00
Regis Houssin
e8b40ab22c Try to build table with div and css 2012-03-17 17:37:15 +01:00
Regis Houssin
e84c77ba31 New: add template for infos and contacts tabs and show/hide bloc system 2012-03-16 22:02:14 +01:00
Regis Houssin
205f884ec0 Fix: try to use div title with show/hide effect 2012-03-16 18:36:32 +01:00
Regis Houssin
5de859d14b Fix: missing colspan if view line number is active 2012-03-16 17:26:19 +01:00
Regis Houssin
09e6867029 New: add view/edit notes in "deplacement" and "fichinter" cards 2012-03-16 16:01:45 +01:00
Regis Houssin
391ce8490f New: add "extraparams" field for stock extra parameters with json 2012-03-16 14:32:37 +01:00
Regis Houssin
dae20441d0 Fix: add template for view/edit notes in object card and add possibility 
to show/hide this bloc
 2012-03-16 09:39:32 +01:00
Regis Houssin
616698889c Fix: move script to js core file 2012-03-09 18:21:11 +01:00
Regis Houssin
96a5eadcfd Fix: missing extension 2012-03-09 18:03:32 +01:00
Regis Houssin
0dbef2d784 Try to add hook in main login page 2012-03-03 20:05:32 +01:00
Laurent Destailleur
e4cf111ac2 Fix: Do not include an output class (form) inside a core system class. 2012-02-22 14:43:13 +01:00
Laurent Destailleur
48f5f0dca7 Uniformize login and password forgotten page 2012-02-19 12:54:04 +01:00
Laurent Destailleur
9639769575 Fix: Use correct css if using not embedded jquery 2012-02-18 17:19:50 +01:00
Laurent Destailleur
c94c1b7f85 Fix: The login page must use same header than others. 2012-02-18 17:10:29 +01:00
Regis Houssin
1f5a103851 Fix: use POST instead GET for bypass GET limit 2012-02-13 12:40:43 +01:00
Regis Houssin
7e5c347bb8 Fix: correct reorder childrens of lines 2012-01-24 05:31:49 +08:00
Laurent Destailleur
ebf8a6eef4 artichow was used only for captcha generation so i replaced with 
dolibarr code to allow to remove completely artichow (artichow project
is dead).
 2012-01-07 23:31:25 +01:00
Regis Houssin
2ee7becfed New: add constant MAIN_VIEW_LINE_NUMBER 2011-12-16 18:31:54 +01:00
Laurent Destailleur
457b0b9753 Fix: Login not visible when forced on url 2011-11-27 15:01:34 +01:00
Laurent Destailleur
f803ca4e95 Fix: Bad parameters 2011-11-25 18:36:39 +01:00
Laurent Destailleur
96ddd99664 New: autofocus on description after adding a free product 2011-11-22 01:07:40 +01:00
Laurent Destailleur
bf9c482f8a Fix: Deposits was not included into lines but into into remain to pay 2011-11-16 18:58:11 +01:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner 
and all this duplicated options were useless.
 2011-11-05 23:18:49 +01:00
Laurent Destailleur
ecb6c1e67d Fix: DST is correctly detected 2011-11-01 04:57:45 +01:00
Laurent Destailleur
eaeb399f02 Qual: Uniformize variable name 2011-10-30 17:26:55 +01:00
Laurent Destailleur
b9c2162539 Qual: Removed PHP warnings 2011-10-30 17:13:29 +01:00
Regis Houssin
df19c5e606 Fix: move ajax tpl to js for uniform code 2011-10-27 18:06:05 +02:00
Regis Houssin
f079b63438 Fix: security 2011-10-26 10:55:56 +02:00
Regis Houssin
a806f1ae09 Fix: size of fields 2011-10-26 10:22:46 +02:00
Regis Houssin
e2b539ee7d [edit in place] Add edit_text and edit_numeric 2011-10-26 10:20:27 +02:00
Regis Houssin
1398a41add New: works on edit in place 2011-10-25 19:04:02 +02:00
Regis Houssin
5fe088334c Qual: move ajax response in /core/ajax directory 2011-10-25 19:03:12 +02:00
Regis Houssin
cf551f82e7 Move common files in core directory 2011-10-24 10:29:33 +02:00
Regis Houssin
30c5f4b214 Move all core class in htdocs/core/class 2011-10-24 09:29:17 +02:00
Laurent Destailleur
1948fc115e Fix: bug #34545 : Sauts de lignes en vue de produit libre - New lines in 
free product line view
 2011-10-17 14:45:31 +02:00
eldy
c43c2734fb Fix: TVA Non Perçue Récupérable 2011-10-09 17:37:27 +02:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
 2011-09-20 09:40:27 +00:00
Laurent Destailleur
9bdb1057e1 Fix: W3C 2011-08-31 15:30:56 +00:00
Laurent Destailleur
d4dfbc487a Fix: W3C 2011-08-31 15:21:44 +00:00
Regis Houssin
a5f7bf3903 Fix: more simple 2011-08-30 17:51:12 +00:00
Laurent Destailleur
4502ad2a88 Add warning 2011-08-28 13:47:45 +00:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +00:00
Regis Houssin
692d8beb0a Fix: syntax error in tpl/predefinedproductline_edit.tpl.php 2011-08-24 21:19:04 +00:00
Laurent Destailleur
1d3959534d Qual: No variable set inside a template 2011-08-20 15:33:16 +00:00
Laurent Destailleur
e326b78e5e Fix: Fix regression. Style was lost. 2011-08-20 15:28:32 +00:00
Cyrille de Lambert
6ee0b63c6b Adding favicon in each theme. 
New theme must be to have favicon.ico
 2011-08-19 15:06:27 +00:00
Regis Houssin
4e00334157 Fix: works on repair broken features 2011-08-11 09:25:07 +00:00
Regis Houssin
227ef6364f Fix: works on repair broken features 2011-08-11 07:41:41 +00:00
Laurent Destailleur
b93304fd18 Format source 2011-08-11 01:36:53 +00:00
Laurent Destailleur
20d0cd7693 Removed deprecated files Smarty. 2011-08-10 23:29:50 +00:00
Laurent Destailleur
acea604e54 Change signature of all call executHooks. 
Now they accept all the following signature:
executeHooks('method',$parameters,$object,$action)
 2011-08-10 22:47:33 +00:00
Regis Houssin
f9c879528d Fix: works on repair broken features (in progress) 2011-08-10 10:55:34 +00:00
Laurent Destailleur
d246b87c1a Fix: removed print of function making print. 
Fix: default vat rate must be -1 to be automatic instead of deprecated conf->defaulttx
 2011-08-04 21:46:50 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Laurent Destailleur
cc840ad66e Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
Laurent Destailleur
8c103e09e5 Add comment 2011-07-10 13:39:34 +00:00
Regis Houssin
0e6e1574ce Fix: template is broken 2011-07-08 14:00:08 +00:00
Laurent Destailleur
b550807090 Fix: Removed a conception error reported by eclipse validators. 2011-07-08 13:07:44 +00:00
Laurent Destailleur
c6a2796d8b Work on ajax file upload component. Component must be used only to make "upload" or multiupload. Output list of files must be independant of upload component because will be enhanced differently. Also, usage of upload component is more clear like that. 
Still TODO: Once last files was uploaded (when there is several files), we must launch the refresh of page.
 2011-07-05 22:40:35 +00:00
Regis Houssin
09cf193893 Fix: translation 2011-07-05 09:30:10 +00:00
Regis Houssin
54d68a12ec Fix: max file size limit 2011-07-05 09:14:26 +00:00
Regis Houssin
69b50cf321 Works on jQuery file upload 2011-07-03 14:43:12 +00:00
Regis Houssin
7fb0766f90 Works on jQuery file upload 2011-07-03 13:45:32 +00:00
Regis Houssin
f3accf8109 Works on jQuery file upload 2011-07-03 13:26:45 +00:00
Regis Houssin
3ef3de5aa9 Works on jQuery file upload 2011-07-03 13:16:46 +00:00
Regis Houssin
f344dbdefe Fix: Name of hook must also be unique for each tab 2011-06-30 13:27:20 +00:00
Laurent Destailleur
45823ab7a6 Fix: Use correct formating function. 2011-06-15 06:38:34 +00:00
Regis Houssin
089039d6ef Fix: possibility to have more hooks in the same page 
New: add left search block hook and extra left block hook
 2011-06-01 17:17:23 +00:00
Regis Houssin
8e25cb1ae5 Fix: possibility to have more hooks in the same page 
New: add left search block hook and extra left block hook
 2011-05-31 14:04:45 +00:00
Regis Houssin
228b11befb Fix: problem with bullet/number list with ckeditor 2011-04-28 09:58:53 +00:00
Regis Houssin
07bfba0db4 Fix: add return line 2011-04-20 08:50:41 +00:00
Regis Houssin
e7b7633162 Fix: Do not use GET here, but put information into parameter of function 2011-04-16 08:57:06 +00:00
Regis Houssin
f9b14626e3 Todo: using div instead of tables 2011-04-16 08:05:01 +00:00
Regis Houssin
be9c6d2d66 Fix: code is better 2011-04-12 08:15:45 +00:00
Regis Houssin
51473444a3 New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 08:00:24 +00:00
Regis Houssin
a55aaae6b8 New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 07:59:37 +00:00
Regis Houssin
65a8511a36 New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 07:58:15 +00:00
Regis Houssin
272ec2779f New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 07:56:15 +00:00
Regis Houssin
99d2185d9a New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 07:48:07 +00:00
Regis Houssin
1c89213caf Fix: reorder the lines correctly 2011-04-11 09:00:13 +00:00
Laurent Destailleur
0d6fb6d7d8 Add comment to explain things to do to fix templates architecture 2011-04-11 08:34:26 +00:00
Regis Houssin
be28754feb Fix: uniformize code 2011-04-10 06:10:42 +00:00
Regis Houssin
252c8eefd5 Fix: add picto for child line 2011-04-09 20:54:02 +00:00
Regis Houssin
5c1fd271ef Fix: hook functions with better name 
New: add hook in builddoc bloc
 2011-04-08 17:21:42 +00:00
Regis Houssin
ef14fba623 Works on hook 2011-04-08 13:47:06 +00:00
Regis Houssin
83cf657906 Fix: use PropalLigne class 
Works on hook
 2011-04-08 10:10:08 +00:00
Regis Houssin
914e4a4bf1 Fix: product lines with parent line better works 
Fix: add trigger LINEPROPAL_DELETE
 2011-04-07 10:18:41 +00:00
Regis Houssin
2757038f1f Fix: compatibility with external module and hook 2011-04-06 07:32:54 +00:00
Regis Houssin
c3ad329888 For test html5 compatibility 2011-03-20 11:05:16 +00:00
Regis Houssin
24729ac628 For test xhtml compatibility 2011-03-20 10:40:41 +00:00
Regis Houssin
406725a894 For test xhtml compatibility 2011-03-20 10:16:18 +00:00
Regis Houssin
874157cdff Fix: W3C 2011-03-06 20:13:29 +00:00
Laurent Destailleur
a8f9a9d0c6 New: a specialized menu is now used when using smartphones 2011-02-16 19:59:16 +00:00
Regis Houssin
09f6fab2cc New: add width parameter in editor 2011-02-02 16:56:55 +00:00
Regis Houssin
7ce3f56a6c Works on ckeditor integration 2011-01-31 22:22:35 +00:00
Regis Houssin
ba052d4636 Fix: $soc redefined to $buyer 2011-01-28 08:47:36 +00:00
Laurent Destailleur
0d3899ab23 Fix: W3C errors or warnings 2011-01-09 15:37:23 +00:00
Laurent Destailleur
e94edf8cd8 Removed useless code 2010-12-20 12:16:31 +00:00
Regis Houssin
3545ed51c5 Fix: more open for external modules and less intrusive 2010-12-17 10:08:31 +00:00
Laurent Destailleur
1f0123cf25 Fix: rename version num with "latest" expression 2010-12-14 23:52:34 +00:00
Laurent Destailleur
2498426867 Fix: Restore stable version for 3.0 2010-12-14 23:27:17 +00:00
Regis Houssin
ec73198bf5 Fix: rename version num with "latest" expression 2010-12-14 17:40:52 +00:00
Laurent Destailleur
0d4aa481cd New: Function dol_now('tzuser') is now supported. 2010-12-08 11:45:47 +00:00
Laurent Destailleur
22bea1b613 New: Prepare for new features 2010-12-01 23:56:55 +00:00
Laurent Destailleur
6e75a3d203 Restore work lost by savannah backup 2010-12-01 21:16:28 +00:00
Laurent Destailleur
84f874c49a Fix: W3C 2010-11-01 15:37:37 +00:00
Laurent Destailleur
8210299895 Fix: Date range was lost in edit mode. 2010-10-16 14:54:09 +00:00
Laurent Destailleur
f30061ca0c Fix: Can not edit line for free product lines. Also type was lost. 2010-10-16 13:10:24 +00:00
Laurent Destailleur
624d79b437 Fix: Minor fix in look 2010-10-09 11:37:29 +00:00
Laurent Destailleur
cfe7215288 New: Use ajax to change order of lines. 2010-10-02 20:47:55 +00:00
Regis Houssin
4950775197 Fix: hide arrows if edit line 2010-10-01 16:19:53 +00:00
Laurent Destailleur
7c890a0daa Same but using style instead of hard coded cell 2010-09-28 18:00:59 +00:00
Regis Houssin
ca85e8b577 Test: reorder line with jquery 2010-09-27 16:23:58 +00:00
Laurent Destailleur
9e93042302 Add style dragHandle 2010-09-18 15:34:06 +00:00
Laurent Destailleur
258f260399 Add more style 2010-09-18 15:00:40 +00:00
Laurent Destailleur
50a511ae1a Fix: W3C 2010-09-18 14:44:57 +00:00
Regis Houssin
27a930a606 Qual: uniformize code 2010-09-18 09:40:24 +00:00
Regis Houssin
481ecd6a87 Test: reorder lines with jquery 2010-09-18 07:52:17 +00:00
Regis Houssin
6ae6664828 Fix: lost discount from deposit 2010-09-15 14:28:59 +00:00
Laurent Destailleur
b4eb8ae2f2 Fix: A lot of feature was lost because global variables were not propagated into templates. 2010-09-15 13:51:31 +00:00
Laurent Destailleur
94a5c1c736 Fix: A lot of feature was lost because global variables were not propagated into templates. 2010-09-15 13:29:17 +00:00
Regis Houssin
928f4f42d5 Test: reorder lines with jquery 2010-09-14 07:05:31 +00:00
Regis Houssin
8cc8717b39 Test: reorder lines with jquery 2010-09-13 19:00:49 +00:00
Regis Houssin
5cbde19432 Works on module hook integration 2010-09-10 09:52:08 +00:00
Regis Houssin
ce47950a4b Fix: bad syntax 2010-09-09 17:09:07 +00:00
Regis Houssin
5fd1a87ad4 Works on module hook integration 2010-09-08 17:02:24 +00:00
Regis Houssin
530e321a3e Works on module hook integration 2010-09-08 16:09:59 +00:00
Laurent Destailleur
554abc46c7 Work on task #10579 : Simplify code using editor 2010-09-02 18:51:47 +00:00
Laurent Destailleur
686230c015 Restore broken feature 2010-08-09 17:22:03 +00:00
Laurent Destailleur
ffc6739d59 Fix: Field name of date for predefined product form must differs from date of free product to avoid javascript conflict 2010-08-09 17:04:05 +00:00
Regis Houssin
add1bb0023 Works on templates implementation for mutualized code 2010-08-05 10:07:05 +00:00
Regis Houssin
9f0bde74b6 Works on templates implementation for mutualized code 2010-08-05 09:45:59 +00:00
Regis Houssin
398969f6bf Works on templates implementation for mutualized code 2010-08-05 09:12:07 +00:00
Laurent Destailleur
2183739757 Fix: W3C errors 2010-07-21 18:24:26 +00:00
Regis Houssin
c439e4088f Fix: use php templates by default 2010-04-28 10:17:44 +00:00
Regis Houssin
3ee92a0de3 Fix: mutualize code and template 
Works on workflow management
 2010-04-22 18:37:42 +00:00
Regis Houssin
3268dcbab8 Fix: missing google ad 2010-04-18 14:43:47 +00:00
Regis Houssin
ef4df127f9 Fix: missing google ad 2010-04-18 14:31:34 +00:00
Regis Houssin
6e24ebd01f Fix: missing google ad 2010-04-18 14:24:09 +00:00
Regis Houssin
677ab4c128 Fix: missing google ad 2010-04-18 14:23:21 +00:00
Regis Houssin
79d7be01d1 Fix: the core system used php templates by default 2010-04-12 18:56:53 +00:00
Laurent Destailleur
b5bc6dac90 Qual: Remove deprecated code 2010-04-04 23:46:53 +00:00
Regis Houssin
40b5352430 Fix: rename "templates" to "tpl" 2010-03-30 13:26:20 +00:00