Commit Graph

55623 Commits

Author SHA1 Message Date
gauthier
a4d0eed503 NEW : Save product stock warehouse in database and display list 2016-09-19 17:33:29 +02:00
gauthier
7a0577ccfc NEW : add limit stock product by warehouse 2016-09-16 17:09:38 +02:00
Laurent Destailleur
d0136f5c85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/websites/index.php
2016-09-16 01:23:54 +02:00
Laurent Destailleur
72aacb81ae NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:13:52 +02:00
Laurent Destailleur
a97161b044 NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:00:24 +02:00
Laurent Destailleur
68b3de5b37 NEW ckeditor accept a parameter to disable all html filtering 2016-09-15 23:23:10 +02:00
Laurent Destailleur
8a32391171 Work on website module 2016-09-15 19:27:04 +02:00
Laurent Destailleur
621ba7b76f Work on module website 2016-09-15 09:33:00 +02:00
Laurent Destailleur
22df7d7a68 Work on module website 2016-09-14 23:42:17 +02:00
Laurent Destailleur
4228a51f18 Work on module website 2016-09-14 23:23:22 +02:00
Laurent Destailleur
5146a0ce56 Fix filter on num account statement 2016-09-14 21:29:08 +02:00
Laurent Destailleur
145c1e1cc8 NEW Add account statement into fields of bank account transaction list 2016-09-14 21:26:57 +02:00
Laurent Destailleur
630aab9124 NEW Can select fields to show on list of bank transaction 2016-09-14 21:06:16 +02:00
Laurent Destailleur
a7b1d4a61c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-09-14 19:49:14 +02:00
Laurent Destailleur
aa59420413 FIX #5712 #5751 2016-09-14 19:48:57 +02:00
Juanjo Menent
533bee9321 Merge pull request #5745 from IonAgorria/fix-supplierorder-clone
Fix ref supplier not recorded in addline
2016-09-14 16:34:10 +02:00
Laurent Destailleur
571c127ce4 Remove not existing function sqlite_select_db() #5609 2016-09-14 11:47:39 +02:00
Laurent Destailleur
31a036c992 Removed driver sqllite that was never released as stable and is now
deprecated #5609
2016-09-14 11:42:07 +02:00
Laurent Destailleur
39d47eab18 NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment
term on company level.
2016-09-14 11:17:44 +02:00
Ion Agorria
2bc41a1fd0 Fix ref supplier not recorded in addline 2016-09-13 18:41:13 +02:00
Laurent Destailleur
2facdda690 Uniformize code 2016-09-12 21:54:45 +02:00
Laurent Destailleur
2acce85fab NEW Pagination available on list of users 2016-09-12 21:32:27 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
5c1127fc54 NEW Enhance function setValueFrom so we can use it for "edit in form"
feature.
2016-09-12 20:00:47 +02:00
Laurent Destailleur
efb05fda6a Cleaner code to avoid to log when nothing is done 2016-09-12 19:58:43 +02:00
Laurent Destailleur
1f9aa856d5 NEW the list of linked files on card does not forget external links. 2016-09-12 18:37:40 +02:00
Laurent Destailleur
2587958c89 Introduce hidden constant PRODUCT_ADD_FORM_ADD_TO for an old feature not
used so we can disable/enabled if we want.
2016-09-12 18:15:01 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Laurent Destailleur
359ebed882 FIX #5696 2016-09-12 02:57:28 +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
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
da41c3ffa7 Fix better fix to increase size of login_block to allow external icon. 2016-09-12 01:34:37 +02:00
Laurent Destailleur
c71fc18942 NEW Checkbox 'close order to "Everything received" automatically if all
products are received' is visible on supplier orders.
2016-09-12 01:05:45 +02:00
Laurent Destailleur
4ea5068966 FIX Clean of search fields 2016-09-12 00:15:27 +02:00
Laurent Destailleur
828fe984e8 FIX #5734 2016-09-12 00:09:46 +02:00
Laurent Destailleur
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
1522d6060d Fix some translation 2016-09-11 22:54:23 +02:00
Laurent Destailleur
08dc7ade3b Fix list of supplier price must show price compared to quantity. 2016-09-11 14:04:03 +02:00
Laurent Destailleur
9709c8bbbf FIX inversion customer/supplier price 2016-09-11 13:48:45 +02:00
Laurent Destailleur
6e9e3e82ed FIX inversion customer/supplier price 2016-09-11 13:48:05 +02:00
Laurent Destailleur
cad69c9e90 Fix phpcs 2016-09-11 13:38:15 +02:00
Laurent Destailleur
e90909051e Merge pull request #5718 from atm-alexis/NEW_filter_type_action_thirdparty_event_tab
NEW filter on action type on thirdparty event tab
2016-09-11 13:34:08 +02:00
Laurent Destailleur
9252914a09 Fix avoid useless param if not defined 2016-09-11 13:30:14 +02:00
Laurent Destailleur
1ef0409b28 Merge pull request #5693 from atm-florian/dev_projectwork
Add projectid into link create from
2016-09-11 13:26:22 +02:00
Laurent Destailleur
7f6a19f0bf Merge pull request #5706 from philippe-opendsi/develop
FIX #5705 Supplier Order's lines array initalisation
2016-09-11 10:53:09 +02:00
Laurent Destailleur
0ff42b5f8a If search of cron job is empty, we must show empty list 2016-09-10 19:53:32 +02:00
Laurent Destailleur
dd1d3c866c NEW Add a better icon to show when play in cron jobs is disabled. 2016-09-10 19:48:50 +02:00
Laurent Destailleur
25c5f40bf1 Add css on picto status 2016-09-10 19:44:55 +02:00
Laurent Destailleur
49e54d55d5 Removed old option PRODUCT_SHOW_WHEN_CREATE. It was bugged and not
usable.
2016-09-10 18:19:54 +02:00
Laurent Destailleur
72600a521d Fix help 2016-09-10 18:15:03 +02:00