Commit Graph

187 Commits

Author SHA1 Message Date
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe GRAND
e35da2f84d Standardize code 2018-08-14 09:55:58 +02:00
Philippe GRAND
a952b46d8b clean and update code 2018-06-27 12:37:31 +02:00
Laurent Destailleur
e9b4141dd9 Fix syntax error 2018-06-23 17:11:19 +02:00
Laurent Destailleur
dbb90e80a3 Fix syntax error 2018-06-23 12:57:41 +02:00
Laurent Destailleur
6f1101a2d6
Update card.php 2018-06-22 15:51:26 +02:00
Regis Houssin
b9893bde1d Fix: avoid Warning: A non-numeric value encountered 2018-06-19 18:26:37 +02:00
Frédéric FRANCE
58e5715ac3
loadlangs 2018-05-26 17:57:30 +02:00
Laurent Destailleur
3c903675f2 Fix colspan 2018-02-28 15:29:52 +01:00
Laurent Destailleur
5ef7bee030 Use combo for selection of categories into virtual product edition 2018-02-28 15:27:21 +01:00
Laurent Destailleur
2cd5ed65a6 Clean deprecated (field unit_charge in supplier price) 2018-02-25 14:13:09 +01:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
1002923dea Fix css 2017-09-26 10:58:24 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00
Laurent Destailleur
48ae76e295 Fix picto on service 2017-09-15 19:13:40 +02:00
Laurent Destailleur
55e31796d2 Code comment 2017-09-15 19:08:39 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
64a6ff9687 Fix test for navigation disabling for external users 2017-06-12 16:26:25 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
1a8884bbbe NEW Can filter on year and product tags on the product statistic page 2017-05-22 15:20:52 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
eb37c72513 Uniformise code 2016-10-24 20:56:48 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Laurent Destailleur
d1c4f02bf7 Uniformize code and style 2016-09-18 14:41:17 +02:00
aspangaro
a1d1396919 Uniformize presentation 2016-08-10 07:40:40 +02:00
Laurent Destailleur
629271cf85 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:23:07 +02:00
Laurent Destailleur
e5d0258f33 Fix missing css 2016-07-28 12:22:23 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
758f5897d3 Fix Missing message to explain record is saved 2016-06-09 21:22:07 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
901c7c9517 Link "Backtolist" was missing on products 2016-05-17 02:16:28 +02:00
Laurent Destailleur
2b6029f5d3 FIX Some fix on stock. Condition to view warehouse as column and
protection against infinite loop
2016-05-12 19:44:49 +02:00
Laurent Destailleur
b4e5acbaa9 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/product/class/product.class.php
2016-05-04 14:43:40 +02:00
Laurent Destailleur
911e862a8e Fix missing translation and add a TODO to avoid infinite loop. 2016-05-04 13:49:05 +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
Christophe Battarel
292373cf84 forgot new discount field 2016-04-11 17:43:10 +02:00
Christophe Battarel
983b2c9a21 FIX: real min buying price 2016-04-11 17:40:47 +02:00
philippe grand
de0a13ae8f [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
Marcos García de La Fuente
75b4cb4727 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2 2015-11-07 14:37:47 +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
fmarcet
310ecb1e09 FIX: Show product image on getNomUrl() 2015-10-29 12:28:28 +01:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
fappels
b908f10c5b Fix missing product label in package tab 2015-08-30 11:50:47 +02:00
aspangaro
fb57941b21 typo 2015-06-19 06:06:46 +02:00
Laurent Destailleur
d8f86708b1 Minor look fix 2015-06-19 00:36:03 +02:00
Raphaël Doursenaud
becc240b92 Include Categories class whenever Categorie::TYPE is used 2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
Laurent Destailleur
6108dfad55 Minor enhancement 2015-05-22 00:46:53 +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
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
Laurent Destailleur
333a29683c uniformize look 2015-05-03 21:15:08 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Marcos García de La Fuente
831177ef99 Implemented constants for Product class 2015-03-30 03:14:07 +02:00
Laurent Destailleur
e8e2f65ae5 Debug virtual product interface 2015-03-11 14:55:45 +01:00
Laurent Destailleur
b9d3175897 Fix typo 2015-02-25 23:04:13 +01:00
Laurent Destailleur
89684748c5 Debug incdec option. 2015-02-24 19:55:59 +01:00
Alexis Algoud
29e5b89352 erase some comments 2015-02-23 12:26:27 +01:00
Alexis Algoud
0c53121553 - use incdec into virtual product definition.
- improve screen of virtual product
2015-02-23 12:19:19 +01:00
Laurent Destailleur
43702cf662 New: Enhance stock management: Introduce tag to define if a subproduct
must have stock decreased and add inventory code on stock movements.
2015-01-30 01:51:28 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
7faedf0c69 Uniformize code for search 2014-11-15 11:59:02 +01:00
Laurent Destailleur
b5be8ff620 Fix: Avoid error ErrorBadValueForParamNotAString 2014-10-03 02:45:47 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +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
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Juanjo Menent
d527c4cf73 Fix: Price min of composition is not supplier price min by quantity 2014-04-22 09:57:43 +02:00
Laurent Destailleur
9a6f22a86e Fix: W3C no form into table.
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
2014-01-05 15:46:39 +01:00
Laurent Destailleur
2d260fa6dd Fix: Missing alignement 2013-11-18 14:25:53 +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
a0358dc0c2 Better management of price of subproducts feature 2013-11-14 20:54:40 +01:00
Laurent Destailleur
b911d30684 Fix: Stock into subproduct was wrong
New: Show best sell price and total for virtual products
2013-11-14 17:16:17 +01:00
Laurent Destailleur
656bf480ac Fix: look with jmobile 2013-10-27 00:04:57 +02:00
Laurent Destailleur
31430bb2f9 Solution to support overflow with jmobile 2013-10-26 23:44:19 +02:00
Laurent Destailleur
1ae27b0977 Qual: Remove a useless action button to save one click. 2013-10-26 16:34:31 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Marcos García
3cff899b44 Removed debug message and wrong translation key 2013-06-08 20:01:51 +02:00
Laurent Destailleur
c87c7703cd Qual: Make code simpler. 2013-04-22 13:01:22 +02:00
Laurent Destailleur
5b4b058399 Perf: Minor perf enhancement 2013-04-22 12:30:52 +02:00
Laurent Destailleur
5cbb0359aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd Fix: Some translation change to have things more clear. 2013-04-22 10:33:06 +02:00
Laurent Destailleur
7ff2e559aa Fix: PGsql compatibility 2013-04-22 01:59:52 +02: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
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
7f7676d357 Fix: uniformize variable name 2012-10-08 20:44:12 +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
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +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