Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-29 12:51:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
57,524 Commits 36 Branches 191 Tags
04d73668cc80fa8636e101345dbdcf00a73c8ab0
Commit Graph

121 Commits

Author SHA1 Message Date
Laurent Destailleur
12e919b99d Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin 
Fix user right write margin
 2016-12-18 10:53:34 +01:00
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
phf
cca7967144 Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin 2016-12-15 16:19:54 +01:00
phf
21a648a052 Fix user right on margin module to write buyprice 2016-12-15 12:01:46 +01:00
Maxime Kohlhaas
ac41b61ad8 Empty inputs when editing line 2016-12-11 10:48:49 +01:00
fappels
bbbc768fa7 Change filter parameter to string with comma seperated values 
Change warehousefilter from int to string with comma seperated values
for selectWarehouses and select_produits form functions.
 2016-12-06 20:07:19 +01:00
fappels
c911f906c8 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 11:36:20 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
fappels
c697141851 hide products in closed warehouse, but show products for internal transfer 
Products only for internal transfer should be sellable (for example,
they can have virtual stock)
 2016-12-02 12:22:09 +01:00
fappels
49442c0b7f Add filter on warehouse status to object line product list 2016-11-30 13:03:17 +01:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
 2016-09-19 14:05:16 +02:00
Laurent Destailleur
5fb55cc9de Fix css 2016-09-18 22:00:59 +02:00
Laurent Destailleur
aa59420413 FIX #5712 #5751 2016-09-14 19:48:57 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
00118610bb A fix to make editinplace working better 2016-07-28 15:29:46 +02:00
Laurent Destailleur
e8b5fc5d06 Fix css to add bold border must be forced only when not previously done 2016-07-28 14:37:36 +02:00
Laurent Destailleur
4708f0114c Clean code 2016-06-29 10:05:05 +02:00
Laurent Destailleur
afdef9a328 Add css 2016-05-19 18:52:22 +02:00
Laurent Destailleur
c73f4e5d7b FIX Project was lost when creating invoice from a template 
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
 2016-04-24 20:00:00 +02:00
Laurent Destailleur
1de36d6501 Merge pull request #5011 from altatof/supplierorder_noprice 
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED
 2016-04-22 18:27:42 +02:00
Juanjo Menent
bff1ec2d80 Merge remote-tracking branch 'upstream/3.9' into develop 2016-04-15 13:49:59 +02:00
Juanjo Menent
8751f6cfa0 Merge pull request #4998 from FHenry/3.9 
FIX Hook resprint  must be printed
 2016-04-15 13:05:40 +02:00
Christophe Battarel
c3d4cd85f1 NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier 
order even if no supplier price defined
 2016-04-15 12:28:35 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Florian HENRY
872c99afe9 FIX Hook resprint be printed 2016-04-12 11:35:39 +02:00
Laurent Destailleur
22bfa7a9e2 Add logs 2016-04-08 21:50:48 +02:00
Laurent Destailleur
6a4ca98ad9 Merge pull request #4908 from altatof/fix_bad_rounding 
FIX: systematic rounding causes prices to be updated without reason
 2016-04-04 00:18:18 +02:00
Christophe Battarel
024f55d461 FIX: systematic rounding causes prices to be updated without reason 2016-03-29 12:02:36 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Ion Agorria
4300ca8bdc Use isset instead of !empty in default date 2016-03-04 00:50:47 +01:00
Ion Agorria
6feaaf906c NEW: Configurable default hour and min in date start/end 2016-03-03 16:11:42 +01:00
phf
f7afbcff68 NEW integration of multicurrency module (creation fields in database and admin) 
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
 2016-01-21 21:38:52 +01:00
Laurent Destailleur
d396612a7c NEW: Add a new method for margin calculation. Added margin on "cost 
price" to margin on WAP price and margin on "best supplier price".
 2016-01-13 12:48:59 +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
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
548ff26628 Focus on textarea works also when ckeditor is on 2015-11-21 13:42:01 +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