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

3879 Commits

Author SHA1 Message Date
Regis Houssin
cdd1473cfa Fix: avoid Warning: A non-numeric value encountered 2017-09-18 16:30:01 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
dece156a99 NEW Add supplier proposals into stats of product page. 2017-09-17 18:08:43 +02:00
Laurent Destailleur
a3c555049d NEW Add supplier proposals into stats of product page. 2017-09-17 18:08:23 +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
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +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
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
f5d2283093 USe second parameter in GETPOST 2017-09-15 10:52:53 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
8f5206accf NEW The lot of a product uses the link and picto when shown into list. 2017-09-15 10:45:41 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
149ab80b3a The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
Laurent Destailleur
724817139d Start remove $GLOBALS 2017-09-12 19:49:07 +02:00
Laurent Destailleur
939d33cce7 Fix bug reported by scrutinizer 2017-09-12 19:12:39 +02:00
Laurent Destailleur
47d2350ad4 Fix bugs reported by scrutinizer 2017-09-12 19:03:12 +02:00
Laurent Destailleur
d572e1ddad Fix duration output 2017-09-12 17:30:18 +02:00
fappels
681c2a67bd Fix batch required for lot product error message. 2017-09-11 23:22:44 +02:00
Laurent Destailleur
cb0c7d6594 Standardize search field name 2017-09-11 00:10:23 +02:00
Laurent Destailleur
cb7456239b Remove deprecated file 2017-09-11 00:03:05 +02:00
Laurent Destailleur
cf56da8102 NEW Default filter and sort order can use partial list of query 
parameters to set the qualified URLs.
 2017-09-11 00:02:52 +02:00
Laurent Destailleur
4f52871c67 Merge pull request #7345 from AXeL-dev/develop 
fix hidepriceinlabel when using ajax autocompleter
 2017-09-08 21:22:38 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97 Escape all status 2017-09-08 13:23:12 +02:00
AXeL-dev
a615a46a5a fix hidepricelabel when using ajax autocompleter 2017-09-08 11:06:55 +01:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
fappels
533881e620 Fix supplier prices not shown when best buy hidden 
only show value if item has supplier
 2017-08-25 11:58:34 +02:00
Laurent Destailleur
4337001418 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/list.php
 2017-08-24 14:26:45 +02:00
Laurent Destailleur
bf1f60b31e Merge 2017-08-23 17:14:29 +02:00
Laurent Destailleur
90afbcb034 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/bank.php
	htdocs/core/lib/functions.lib.php
 2017-08-23 17:02:53 +02:00
Laurent Destailleur
6b5b10fc94 FIX #7224 2017-08-23 16:28:34 +02:00
Laurent Destailleur
f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/supplier_payment.php
	htdocs/core/lib/ajax.lib.php
	htdocs/don/admin/donation.php
	htdocs/product/admin/product.php
 2017-08-23 16:11:51 +02:00
Regis Houssin
2492b9968a Fix: missing scandir 2017-08-23 10:21:10 +02:00
Regis Houssin
6dda2f3670 Fix: "scandir" in url is blocked in some providers 2017-08-23 10:07:00 +02:00
Laurent Destailleur
681623c3ab Merge branch 'develop' into patch-1 2017-08-22 11:43:25 +02:00
Laurent Destailleur
7d57cd6913 Update productcustomerprice.class.php 2017-08-22 11:38:32 +02:00
Laurent Destailleur
097b660c41 Mutualize code 2017-08-18 16:25:00 +02:00
Laurent Destailleur
e9eefb170f Merge pull request #7212 from ATM-Marc/NEW_price_formObjectOptions_hook 
NEW hook formObjectOptions in the form setting product selling price
 2017-08-17 18:25:30 +02:00
Laurent Destailleur
40b3c7c4d5 Merge pull request #7253 from altatof/fix_restrictedarea_parms 
FIX : same logic for setting fieldvalue and fieldtype
 2017-08-17 17:22:36 +02:00
altatof
650e4eaa50 FIX : same logic for setting fieldvalue and fieldtype 2017-08-10 16:41:09 +02:00
Laurent Destailleur
402e6bf650 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/index.php
	htdocs/compta/paiement/list.php
	htdocs/core/modules/modCron.class.php
 2017-08-04 15:39:00 +02:00
Laurent Destailleur
7c840b8348 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-04 15:32:30 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
 2017-08-02 17:56:09 +02:00
Laurent Destailleur
c8b79214cd Fix translation 2017-08-02 14:53:42 +02:00
Laurent Destailleur
025ecd4ecc Fix default value for inventory code during a stock correction 2017-08-02 14:21:20 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
florian HENRY
53add04a2e fix :add missing hook into product price card 2017-07-31 10:28:24 +02:00
Marc de Lima Lucio
2cb89b2d8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_price_formObjectOptions_hook 2017-07-27 17:16:58 +02:00
Marc de Lima Lucio
677d50df5b NEW: add 'formObjectOptions' hook to the form setting the product selling price 2017-07-27 17:11:15 +02:00
Laurent Destailleur
5bf10737d9 Merge branch 'develop' into patch-14 2017-07-25 18:32:36 +02:00
Laurent Destailleur
4ef36746bd Merge pull request #7199 from hguibourgdev/patch-13 
NEW : Add toolkit for StockLimit and DesiredStock
 2017-07-25 18:31:12 +02:00
Laurent Destailleur
f6ab691c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 01:22:29 +02:00
Laurent Destailleur
aff61fad7d Fix new generic classes system 2017-07-25 01:21:20 +02:00
hguibourgdev
6b9d25708b NEW : Add toolkit for StockLimit 2017-07-24 21:05:21 +02:00
hguibourgdev
e1f8cfd474 NEW : Add toolkit for StockLimit and DesiredStock 2017-07-24 20:59:46 +02:00
Laurent Destailleur
929d14c816 Merge pull request #7078 from atm-florian/dev_prodlist 
NEW : filter on extrafield on product list (as in company list)
 2017-07-21 15:15:11 +02:00
hguibourgdev
4b0638dd40 Update list.php 
FIX copy-paste error (sell versus buy)
 2017-07-18 14:43:03 +02:00
hguibourgdev
4633d1ae7e Update list.php 
FIX copy-paste error (sell versus buy)
 2017-07-15 19:04:10 +02:00
hguibourgdev
3825e7fd52 Update replenish.php 
FIX ">=" instead of ">" for alert test in order to work when negatif stock are allowed
 2017-07-15 18:55:52 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
florian HENRY
8e3c2af7ee Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_prodlist

Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
 2017-07-10 16:16:11 +02:00
fappels
13d6664ab4 Fix delete product from product card 2017-07-09 12:47:51 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
a9468ad84a Look and feel v6 2017-07-08 00:42:55 +02:00
Laurent Destailleur
608e9e1c82 Look and feel v6 (no amount symbol into list) 2017-07-07 19:48:35 +02:00
Laurent Destailleur
de24e93cca Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list 
NEW: Add column with nbr suppliers prices and WAP to product list.
 2017-07-07 19:42:25 +02:00
Laurent Destailleur
b7af0cca63 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/holiday/card.php
 2017-07-07 19:39:57 +02:00
Laurent Destailleur
aa4ff464d6 Merge pull request #7096 from fappels/6.0_fix_virtual_stock_read_rights_third_parties 
FIX: Ignore third party read rights filter for virtual stock calculation.
 2017-07-07 19:34:12 +02:00
Laurent Destailleur
4c0fcb2b9a Fix total with tax does not include local taxes. To solve, i show both 
totals.
 2017-07-07 14:58:57 +02:00
Laurent Destailleur
8abec461a6 Fix total with tax does not include local taxes. To solve, i show both 
totals.
 2017-07-07 12:31:00 +02:00
fappels
857e45baf3 Fix comment 2017-07-06 15:34:10 +02:00
Laurent Destailleur
95cf36c43b Fix use the getUrl function instead of hard coded curl 2017-07-04 10:55:53 +02:00
fappels
78283b6a0b Ignore rights filter for virtual stock calculation. 2017-06-30 17:02:50 +02:00
fappels
989084e4de WAP always 2 decimals 2017-06-30 10:56:05 +02:00
arnaud
ca6ce2ba8b FIX status were wrong on product referent list 2017-06-30 10:38:54 +02:00
florian HENRY
53510ac660 NEW : filter on extrafield on product list (as in company list) 2017-06-29 10:14:48 +02:00
Laurent Destailleur
adf281c4f3 Look and feel v6 2017-06-27 17:42:07 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
c213624c14 Fix migration into product_lot 2017-06-27 16:42:37 +02:00
Laurent Destailleur
77ba5a8c24 Fix reception of product interface 2017-06-27 14:02:01 +02:00
fappels
e3f7402e07 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list 2017-06-26 22:45:18 +02:00
fappels
13e5c8ff7a Create patch 
Add Number of supplier prices and wap columns
 2017-06-26 22:44:56 +02:00
Laurent Destailleur
59bd4749a8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/class/product.class.php
 2017-06-24 10:27:10 +02:00
Laurent Destailleur
1211e0d7ab FIX vat code not saved during product creation. 2017-06-23 12:09:21 +02:00
Laurent Destailleur
4102403482 Look and feel v6 2017-06-21 11:37:34 +02:00
Laurent Destailleur
bb2d27280b Fix sort link must be disabled for computed field 2017-06-19 14:31:08 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6 Escape hml tags 2017-06-18 19:42:59 +02:00
BENKE Charlene
e98bc90489 introduce OZ : once weight 2017-06-17 10:18:59 +02:00
Laurent Destailleur
b889db997a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/datepicker.php
	htdocs/core/get_menudiv.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/search_page.php
	htdocs/main.inc.php
	htdocs/master.inc.php
	htdocs/product/list.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/card.php
	htdocs/user/index.php
 2017-06-14 10:48:34 +02:00
Laurent Destailleur
e4c7f584e3 Fix option STOCK_SUPPORTS_SERVICES (stock not visible when it should) 2017-06-13 11:45:21 +02:00
Laurent Destailleur
5def2d2600 Add div to help debug of html content 2017-06-13 11:14:52 +02:00
phf
b67a14c7d6 Fix ajax search product is broken 2017-06-13 10:20:26 +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
Laurent Destailleur
cd08690646 Fix ajax search product that return bad json response 2017-06-12 12:42:06 +02:00
Laurent Destailleur
8f7371cdf0 Product has 2 status. Add span to differentiate for css 2017-06-12 12:24:42 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Laurent Destailleur
1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-06-09 12:50:56 +02:00
Laurent Destailleur
1935de03c7 Fix bad consistency of labels 2017-06-09 12:01:55 +02:00
Laurent Destailleur
02781b41ca Fix several problem with hook printFieldListWhere 2017-06-09 11:02:34 +02:00
Laurent Destailleur
b92980c6ff Fix statistics on products 2017-06-09 10:38:06 +02:00
Laurent Destailleur
bec6ad9fb3 Fix bad position of hook 2017-06-09 10:22:07 +02:00
Laurent Destailleur
d6ba16d357 Fix missing printFieldListWhere hook 2017-06-09 09:45:22 +02:00
Laurent Destailleur
b441c62e1d Fix syntax error 2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c Fix security 2017-06-08 14:33:46 +02:00
Laurent Destailleur
543630e487 Fix missing count of nb of columns into lists 2017-06-08 14:14:06 +02:00
Laurent Destailleur
7587a3d592 Merge branch 'develop' into develop_transverse 2017-06-08 10:25:04 +02:00
Laurent Destailleur
cfe9d02bc3 Merge pull request #6952 from atm-ph/fix_search_extrafield_on_list 
Fix can't use search on all extrafields on list
 2017-06-08 10:18:55 +02:00
Regis Houssin
b183c6e7ac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_transverse
 2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
phf
707a9e40c0 Fix can't use search on all extrafields on list 2017-06-06 12:01:49 +02:00
Regis Houssin
03df365eea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 11:01:42 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-03 11:45:15 +02:00
Laurent Destailleur
77df19009d Removed duplicated code 2017-06-01 12:11:45 +02:00
Laurent Destailleur
48a6e9e038 Removed not used files 2017-05-30 22:31:57 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
425192ef84 Merge branch 'develop' into 6.0-multijournal 2017-05-29 10:23:46 +02:00
Alexandre SPANGARO
e89c4e9f41 Merge remote-tracking branch 'uptream/develop' into 6.0-pcard 2017-05-25 07:15:03 +02:00
Alexandre SPANGARO
1f079fac9d Move html.formventilation.class.php to html.formaccounting.class.php 2017-05-25 06:57:28 +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
f5e29d6c86 Fix phpcs warning 2017-05-22 10:45:02 +02:00
Alexandre SPANGARO
d834cbf7ba Use getNomUrl for accounting account in product card 2017-05-21 15:24:16 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Laurent Destailleur
e4ec5aa9a9 Merge pull request #6818 from atm-alexis/NEW_poc_list_product_with_listview 
NEW poc list product with listview
 2017-05-19 18:21:49 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
f3838ee8f2 Fix limit into message 2017-05-17 18:52:01 +02:00
Laurent Destailleur
c224e2b4f6 Remove table that does not exists 2017-05-17 16:05:26 +02:00
Laurent Destailleur
1d6b4cb28a Look and feel v6 2017-05-17 15:25:09 +02:00
Laurent Destailleur
a8afa547f0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
 2017-05-17 15:20:17 +02:00
Laurent Destailleur
e2a7b0943f Clean dead code 2017-05-17 14:52:27 +02:00
Laurent Destailleur
d86b42b024 Missing title, bad css 2017-05-17 14:45:08 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
4dc7d5cd8d Fix : tooltip on bank in customer invoice card 2017-05-14 21:20:35 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
0d11fce834 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-12 15:45:30 +02:00
Laurent Destailleur
5581e5da72 FIX New vat code not correctly implemented if "1 price per customer". 2017-05-12 13:12:17 +02:00
Laurent Destailleur
30cf3f2bda Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/tables/llx_bank_account.sql
 2017-05-11 00:03:06 +02:00
Laurent Destailleur
5e54567558 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
 2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2 Fix label "total for this page" on last page. 2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
alexis portable
8272408b6e fix travis case statement 2017-05-09 14:43:54 +02:00
alexis portable
651ea92657 NEW fix listview class and add a demo for product list 2017-05-09 14:26:47 +02:00
Laurent Destailleur
46ff62fc87 Work on inventory module debug 2017-05-06 22:28:07 +02:00
Laurent Destailleur
d948447600 Add button to disable all personalized default values in one click. 2017-05-06 17:08:38 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
 2017-05-05 14:49:25 +02:00
Laurent Destailleur
768df56c07 Uniformize name of standard PDF template 2017-05-04 20:16:55 +02:00
Laurent Destailleur
c196e79bf4 Merge branch 'develop' into FIX_inventory 2017-05-04 13:50:53 +02:00
Laurent Destailleur
1a6c118a5d Fix travis warning 2017-05-04 12:41:29 +02:00
Laurent Destailleur
8009370f04 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/contact/document.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/repair.sql
 2017-05-04 10:01:11 +02:00
alexis Algoud
6138d197e4 FIX major issues for inventory 
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
 2017-05-02 15:19:55 +02:00
Laurent Destailleur
1e3384a842 Fix travis 2017-04-30 14:16:58 +02:00
Laurent Destailleur
072eb740c7 Fix php compatibility 2017-04-30 13:57:13 +02:00
Laurent Destailleur
865c8140d1 Clean code 2017-04-30 03:23:06 +02:00
Laurent Destailleur
b57bf6460b Start debug inventory 2017-04-30 02:34:00 +02:00
Laurent Destailleur
4993a43025 Move new feature inventory into module stock. 2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e Move new feature inventory into module stock. 2017-04-29 21:53:01 +02:00
Laurent Destailleur
50d65e3a9f Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
 2017-04-29 17:40:47 +02:00
Laurent Destailleur
cd099bf3b1 Fix bad update of prices 2017-04-24 12:42:54 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
3e9ccc186a NEW Small PDF template for products 2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
b054ca8267 NEW Introduce mass action on product list ('delete' for the moment) 2017-04-09 15:02:55 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
ea44e14b60 Start debug the variant module 2017-04-07 11:01:12 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:59:11 +02:00
Laurent Destailleur
18fc5bec9b Better log 2017-04-06 10:56:37 +02:00
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +02:00
Laurent Destailleur
219bcb0d54 Work on 6.0 features. 2017-03-27 22:44:50 +02:00
BENKE Charlie
d8018f7937 add trigger on product price add/update 2017-03-26 19:16:19 +02:00
BENKE Charlie
ec3402a04b Update note.php 2017-03-25 10:52:03 +01:00
BENKE Charlie
656875acb5 Update info.php 2017-03-25 10:49:57 +01:00
BENKE Charlie
a1db02cc08 Update fournisseurs.php 2017-03-25 10:48:50 +01:00
BENKE Charlie
cf68039c36 Update document.php 2017-03-25 10:47:42 +01:00
BENKE Charlie
2e6ab393df add next_prev_filter for pagination 2017-03-25 10:45:01 +01:00
Laurent Destailleur
2f4a4f493e Missin translation 2017-03-25 01:47:52 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
ee8112dde7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/projet/class/project.class.php
 2017-03-21 19:20:14 +01:00
Laurent Destailleur
43e70830ed Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-03-21 17:18:41 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Laurent Destailleur
dfc1ed7d72 FIX #6535 2017-03-16 22:49:02 +01:00
Laurent Destailleur
9827887643 Merge pull request #6519 from marcosgdf/bug-multiprices 
FIX Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
 2017-03-14 10:45:47 +01:00
Laurent Destailleur
d951114c18 Merge branch 'develop' into NEW_odt_others_objects 2017-03-14 10:44:05 +01:00
arnaud
192a825de8 NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class 2017-03-14 09:25:29 +01:00