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

2314 Commits

Author SHA1 Message Date
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +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
f0eb98c27a Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 19:42:49 +01:00
Laurent Destailleur
a6b188ed93 Fix: We should not load stock details at each product fetch 2013-12-10 19:41:45 +01:00
Laurent Destailleur
da569ea8d4 Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 19:39:28 +01:00
Laurent Destailleur
aa4ae60826 Fix: sql where on an int must not contains ' 2013-12-10 18:54:44 +01:00
Laurent Destailleur
df779086a6 Fix: We should not load stock details at each product fetch 2013-12-10 18:04:25 +01:00
Laurent Destailleur
c78fc504af Fix: sql where on an int must not contains ' 2013-12-10 17:21:48 +01:00
Laurent Destailleur
73e60e0629 Fix: Mass update of vat must work also for supplier prices 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-12-07 12:06:41 +01:00
Laurent Destailleur
fa0470bdb9 Fix: Mass update of vat must work also for supplier prices 2013-12-07 02:29:24 +01:00
Laurent Destailleur
01a9b23f26 Fix: Vat rate was not set during update 2013-12-07 01:22:27 +01:00
Laurent Destailleur
5715e9c986 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 17:06:11 +01:00
Laurent Destailleur
d1e62bebf0 Fix: Removed a merged that we ddidn't want. 2013-11-28 17:01:37 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Florian Henry
2178ab6007 Fix [ bug #1156 ] Update TVA mass update tools do not work 2013-11-27 22:05:29 +01:00
Florian Henry
6615ee7e6f [ bug #1148 ] Product consomation : supplier order bad status 2013-11-23 14:59:28 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Laurent Destailleur
20e6ca74c7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-22 18:25:08 +01:00
simnandez
58a8f590e6 New: Add graph stats for suppliers orders in tab "stats" on products. 2013-11-22 14:47:16 +01:00
Laurent Destailleur
04fdfb4047 Fix: Problem with W3C and wrapping of some title lines. 2013-11-22 11:45:42 +01:00
Laurent Destailleur
9e9a386852 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:19:21 +01:00
Laurent Destailleur
e63dcc5343 Fix: [ bug #1119 ] If no country is selected for a warehouse or thids 
card,
broken IMG is shown
 2013-11-21 02:14:25 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Laurent Destailleur
35596acf40 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/product/fiche.php
 2013-11-20 23:46:33 +01:00
Christophe Battarel
e654dac578 [Task 1144 ] Fix wrong max-length of produt ref 2013-11-20 10:33:06 +01:00
Florian Henry
ed21b573ea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-20 00:46:50 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Laurent Destailleur
2d260fa6dd Fix: Missing alignement 2013-11-18 14:25:53 +01:00
Florian Henry
cc43fac0aa Add status filter into product list 2013-11-17 17:25:14 +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
4b26d8441b Fix: Entry lost 2013-11-09 12:52:06 +01:00
Maxime Kohlhaas
1c6edf2d03 Fix : error in replenish SQL 2013-11-08 14:07:11 +01:00
Laurent Destailleur
b2308ba65c Merge pull request #1284 from GPCsolutions/links 
Links
 2013-11-06 17:15:49 -08:00
Laurent Destailleur
94afc84a0c Fix: price should not be lower than min price. 2013-11-06 19:31:13 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +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
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Florian Henry
11d2af0f7e Fix hook object call 2013-11-01 23:20:10 +01:00
Florian Henry
48c8b470af Add hook into product/document.php 2013-11-01 18:59:00 +01:00
Laurent Destailleur
ca95bd67f8 Qual: control of delete usage 2013-10-27 02:23:25 +02:00
Laurent Destailleur
27e59866b0 Fix: responsive desing of page 2013-10-27 01:08:37 +02:00
Laurent Destailleur
7b2e6a2974 Fix: responsive desing of page 2013-10-27 00:34:25 +02: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
f67537799b Fix: Wrong usage of new preoutput confirm box 2013-10-26 18:46:07 +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
3050facb96 Fix: [ bug #1070 ] Accountancy code not displayed just after set 
Conflicts:
	htdocs/product/fiche.php
 2013-10-23 18:29:34 +02:00
Laurent Destailleur
a7ef6e5d70 Fix: [ bug #1070 ] Accountancy code not displayed just after set 2013-10-23 16:24:31 +02:00
Laurent Destailleur
305ca25267 New: Add menu entry to page massstockmove.php 2013-10-20 14:05:51 +02:00
Laurent Destailleur
16b2741834 New: Finished page to make mass stock movement 2013-10-18 19:23:27 +02:00
Laurent Destailleur
bd06ee1abe Prototyping for other table outputs (div or datatable) 2013-10-17 18:37:08 +02:00
Francis Appels
d7fc0eea43 fix: _create() 
add 'require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';'
to htdocs/product/stock/class/mouvementstock.class.php _create method.
This to support product class instance used in function.
 2013-10-15 11:12:41 +02:00
Francis Appels
dde9a6da39 fix: delete() 
The delete method does not delete product_stock record.
Typing error in delete product record debug log, sql iso sqlz
 2013-10-15 11:11:42 +02:00
Laurent Destailleur
61b98275f5 Fix: Error message 2013-10-14 16:01:01 +02:00
Laurent Destailleur
0d36329336 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-14 15:56:42 +02:00
Laurent Destailleur
56730741bc New: Add page to make mass stock transfert. 2013-10-11 13:12:21 +02:00
Laurent Destailleur
ef4970476a Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/product/stock/mouvement.php
 2013-10-10 22:59:22 +02:00
Laurent Destailleur
e12d31766a Fix: Hide a report at wrong place and add a comment to explain where to 
put it and to fix the calculation method.
 2013-10-10 17:34:26 +02:00
Laurent Destailleur
ae8f0c3efd New: Add number of product in stock before and after selected period 
when a filter is done on a period + a specific product.
 2013-10-10 17:16:15 +02:00
Laurent Destailleur
f225b35a90 Fix: filter on warehouse 
Conflicts:
	htdocs/product/stock/mouvement.php
 2013-10-10 15:51:59 +02:00
Laurent Destailleur
bb492d6d1f Fix: filter on warehouse 2013-10-10 15:45:03 +02:00
Laurent Destailleur
a11a0d6491 Fix: debug replanishment feature 2013-10-09 21:09:15 +02:00
Laurent Destailleur
41bf4d53a8 Fix: filter on warehouse 
Conflicts:
	htdocs/product/stock/mouvement.php
 2013-10-09 20:44:42 +02:00
Laurent Destailleur
661faa63dd Fix: filter on warehouse 2013-10-09 20:42:46 +02:00
Laurent Destailleur
f4a83f0851 Qual: Debug of replenishment feature 2013-10-09 20:30:49 +02:00
Laurent Destailleur
61f583e035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-02 16:19:54 +02:00
Laurent Destailleur
4a59a99190 Fix: No filter when already on filtered warehouse. 2013-10-02 16:19:35 +02:00
Laurent Destailleur
3fb890e9b7 New: Add total of unique different product into warehouse 2013-10-02 12:49:28 +02:00
Laurent Destailleur
957ff08458 New: Add update method for web service product. 2013-10-01 11:59:35 +02:00
Laurent Destailleur
b695204259 Fix: invert parameters 2013-09-28 13:27:53 +02:00
Laurent Destailleur
019c86dff0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8 New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS 2013-09-28 13:24:58 +02:00
Laurent Destailleur
9b36df85dd Fix: invert parameters 2013-09-28 13:22:28 +02:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found 
into Actions area of pages (controllers).
 2013-09-23 13:22:28 +02:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Laurent Destailleur
e47165fa38 Merge pull request #1239 from csalvador/replenishment-fix 
Replenishment fix
 2013-09-16 10:39:35 -07:00
Cédric Salvador
967c20e3e9 Improved error message 2013-09-16 14:51:22 +02:00
Cédric Salvador
c62c7c0b1f Stock calculation was wrong in certain cases, should be ok now 2013-09-16 14:37:53 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
8a82b01b22 Merge pull request #1217 from csalvador/replenishment-fix 
Replenishment fix
 2013-09-06 13:48:47 -07:00
Laurent Destailleur
dfce949b06 Merge pull request #1219 from csalvador/hide_purchase_price 
Hide purchase price
 2013-09-06 13:48:04 -07:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Cédric Salvador
4454bc16de indentation 2013-09-06 10:49:18 +02:00
Cédric Salvador
d592e776fd hide purchase price unless the user has the appropriate rights 
Conflicts:
	htdocs/product/liste.php
 2013-09-06 10:40:33 +02:00
Cédric Salvador
413d76ce51 fixed error level 2013-09-06 09:56:07 +02:00
Raphaël Doursenaud
1db9cdac28 Fixed pagination 2013-09-06 09:56:07 +02:00
Cédric Salvador
d8e5fbc662 keep the alert filter when changing page 2013-09-06 09:56:06 +02:00
Cédric Salvador
a9ca9c04ef Fixed request returning nothing when there's no records in llx_product_stock 2013-09-06 09:56:06 +02:00
Cédric Salvador
0a6079934b alertonly checkbox stays checked 2013-09-06 09:56:06 +02:00
Cédric Salvador
41ad9bdb7f frenglish is bad 2013-09-06 09:56:06 +02:00
Cédric Salvador
6015a36183 filter on stock alert 2013-09-06 09:56:06 +02:00
Cédric Salvador
bbae47c48f natural search 2013-09-06 09:56:06 +02:00
Cédric Salvador
b58297a791 fixed warning showing up when searching 2013-09-06 09:56:05 +02:00
Cédric Salvador
6a51f5f87a don't jump to the product card when there's only one research result 2013-09-06 09:56:05 +02:00
Grand Philippe
222eb18bb9 fix : 
Fatal error: Call to undefined function dol_time_plus_duree()
 2013-09-03 17:37:22 +02:00
Laurent Destailleur
20b92ca4d7 Merge pull request #1160 from defrance69/patch-10 
Update index.php
 2013-09-01 15:20:57 -07:00
Laurent Destailleur
1f6d0ab3ef Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2013-08-27 09:36:54 +02:00
Florian Henry
2dce07590c Fix: If only service module is activated, it's impossible to delete 
service
 2013-08-26 14:39:35 +02:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
 2013-08-24 22:41:32 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
simnandez
1f05800909 Fix: [ bug #1037 ] Consumption> Supplier invoices related 2013-08-21 12:08:43 +02:00
simnandez
4e34e7b71c Fix: [ bug #1037 ] Consumption> Supplier invoices related 2013-08-21 12:06:02 +02:00
BENKE Charles
12479a946a Update index.php 
Error on column titles
 2013-08-07 07:28:37 +02:00
BENKE Charles
54d2f1161d Update index.php 
change datep
 2013-08-07 07:15:09 +02:00
BENKE Charles
024ba2ee42 Update index.php 
Add quarter report of sell service/product
 2013-08-06 21:31:32 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Cédric Salvador
3c93aac071 init cond_reglement_id and mode_reglement_id to 0 in orders creations to avoid SQL errors 2013-08-01 15:03:47 +02:00
Cédric Salvador
1993964a46 don't display product if desiredstock = 0 or null 2013-07-29 12:31:17 +02:00
Cédric Salvador
44bde866ee link to go to the second tab and only display orders related to a certain product 2013-07-29 12:31:17 +02:00
Cédric Salvador
c756d34940 changed pictos used in replenish.php 2013-07-29 12:31:17 +02:00
Cédric Salvador
72a3bd9bdd moved warning picto 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
7d573bce1d PSR-0 coding style 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
18ec06a7f9 Allowed displaying products without buying price 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
8d6591ac2f Better comment 2013-07-29 12:31:16 +02:00
Cédric Salvador
5643a714ce changed tab name 2013-07-29 12:31:16 +02:00
Cédric Salvador
d4052f7b9c warning message if you try to create orders without selecting any product 2013-07-29 12:31:16 +02:00
Cédric Salvador
9ff183d432 debug checkbox + use textfields in the to order column 2013-07-29 12:31:16 +02:00
Cédric Salvador
6bf95db95e checkbox + improve order detection 2013-07-29 12:31:16 +02:00
Cédric Salvador
3df097695d removed useless variable 2013-07-29 12:31:16 +02:00
Cédric Salvador
a607cb677d Bug fix: stock to buy now computes correctly when the stock too low picto is present 2013-07-29 12:31:15 +02:00
Cédric Salvador
357dc3e530 datepicker 2013-07-29 12:31:15 +02:00
Cédric Salvador
5062eb8006 check types on getpost + date research 2013-07-29 12:31:15 +02:00
Cédric Salvador
4b90157aa2 switch from print to echo 2013-07-29 12:31:15 +02:00
Raphaël Doursenaud
7abf23c471 PSR coding style 2013-07-29 12:31:15 +02:00
Cédric Salvador
fe8eb1be92 code cleanup 2013-07-29 12:31:14 +02:00
Cédric Salvador
d1550173cd changed valid button label, position and look 2013-07-29 12:31:14 +02:00
Cédric Salvador
1a41511874 redirect user after orders creation 2013-07-29 12:31:14 +02:00
Cédric Salvador
2c3053b9ee selects 2013-07-29 12:31:14 +02:00
Cédric Salvador
72afadb84e fixed success message showing up even when you don't create orders 2013-07-29 12:31:14 +02:00
Cédric Salvador
787125cf12 reformat 2013-07-29 12:31:14 +02:00
Cédric Salvador
3b6fa4a52b message when succeeds/fails to create orders 2013-07-29 12:31:14 +02:00
Cédric Salvador
3c04c6c35b Split the page in two tabs, filters and pagination should work now 2013-07-29 12:31:13 +02:00
Cédric Salvador
407ffb8dd7 typo 2013-07-29 12:31:13 +02:00
Cédric Salvador
47177a2590 typo 2013-07-29 12:31:13 +02:00
Cédric Salvador
c919826104 psr 0 2013-07-29 12:31:13 +02:00
Cédric Salvador
ef8d05676f display the ordered quantity in the ordered column 2013-07-29 12:31:13 +02:00
Cédric Salvador
b261ef2aa2 ordered column 2013-07-29 12:31:13 +02:00
Cédric Salvador
c0c2f9af42 fixed error when trying to create an order when a line has no associated supplier 2013-07-29 12:31:12 +02:00
Cédric Salvador
bcbe940ac0 fixed SQL error when trying to generate an order without selecting any product line 2013-07-29 12:31:12 +02:00
Cédric Salvador
52cfecd0af added an option to use virtual stock instead of physical stock 2013-07-29 12:31:12 +02:00
Cédric Salvador
d4aa2a0f79 show service lines only if the stock services option is enabled 2013-07-29 12:31:12 +02:00
Cédric Salvador
bdb2a00539 products now show up in the list even when they don't have a line in llx_product_stock 2013-07-29 12:31:12 +02:00
Cédric Salvador
d31064a8b1 comments 2013-07-29 12:31:11 +02:00
Cédric Salvador
e5a70ade85 filter out lines where stock > desiredstock 2013-07-29 12:31:11 +02:00
Cédric Salvador
8d00838fa5 moved page + added link in the left menu 2013-07-29 12:31:11 +02:00
Cédric Salvador
194a5f071e trans 2013-07-29 12:31:11 +02:00
Cédric Salvador
6f2bea124f some improvement to the wizard UI 2013-07-29 12:31:11 +02:00
Cédric Salvador
47a1ffd58c order creation wizard 2013-07-29 12:31:11 +02:00
Cédric Salvador
d3975bce7a copyright 2013-07-29 12:31:11 +02:00
Cédric Salvador
e92858be36 wizard UI 2013-07-29 12:31:10 +02:00
Raphaël Doursenaud
2f5f96dc13 PSR coding style 2013-07-29 12:31:10 +02:00
Cédric Salvador
f0243646df code cleanup 2013-07-29 12:31:10 +02:00
Cédric Salvador
dbdaa379c8 reformat 2013-07-29 12:31:10 +02:00
Cédric Salvador
2a4ce81f44 changed valid button label, position and look 2013-07-29 12:31:10 +02:00
Cédric Salvador
2900227236 redirect user after orders creation 2013-07-29 12:31:10 +02:00
Cédric Salvador
9dfa5c4218 selects 2013-07-29 12:31:09 +02:00
Cédric Salvador
89ceafaef5 research by date 2013-07-29 12:31:09 +02:00
Cédric Salvador
6e55d1c471 fixed success message showing up even when you don't create orders 2013-07-29 12:31:09 +02:00
Cédric Salvador
810743cddc fixed research calling replenish.php 2013-07-29 12:31:09 +02:00
Cédric Salvador
2c82484d45 reformat 2013-07-29 12:31:09 +02:00
Cédric Salvador
4c50b23b40 message when succeeds/fails to create orders 2013-07-29 12:31:09 +02:00
Cédric Salvador
a637127599 Split the page in two tabs, filters and pagination should work now 2013-07-29 12:31:09 +02:00
Cédric Salvador
e9ef91cdbc typo 2013-07-29 12:31:08 +02:00
Cédric Salvador
8517706ec2 typo 2013-07-29 12:31:08 +02:00
Cédric Salvador
2f6c979c32 psr 0 2013-07-29 12:31:08 +02:00
Cédric Salvador
e068655e6e display the ordered quantity in the ordered column 2013-07-29 12:31:08 +02:00
Cédric Salvador
dcc6a9aad8 ordered column 2013-07-29 12:31:08 +02:00
Cédric Salvador
47a07c1c29 fixed error when trying to create an order when a line has no associated supplier 2013-07-29 12:31:07 +02:00
Cédric Salvador
d262f044ce fixed SQL error when trying to generate an order without selecting any product line 2013-07-29 12:31:07 +02:00
Cédric Salvador
9b4601bcf2 added an option to use virtual stock instead of physical stock 2013-07-29 12:31:07 +02:00
Cédric Salvador
737aa7819f show service lines only if the stock services option is enabled 2013-07-29 12:31:07 +02:00
Cédric Salvador
80a9dbfb90 products now show up in the list even when they don't have a line in llx_product_stock 2013-07-29 12:31:07 +02:00
Cédric Salvador
9f4e641cd9 comments 2013-07-29 12:31:06 +02:00
Cédric Salvador
66cb265d2b filter out lines where stock > desiredstock 2013-07-29 12:31:06 +02:00
Cédric Salvador
da5bbd0a08 moved page + added link in the left menu 2013-07-29 12:31:06 +02:00
Cédric Salvador
2566f9017d trans 2013-07-29 12:31:06 +02:00
Cédric Salvador
b8f5aef27f some improvement to the wizard UI 2013-07-29 12:31:05 +02:00
Cédric Salvador
3e77575768 order creation wizard 2013-07-29 12:31:05 +02:00
Cédric Salvador
6927274d2a copyright 2013-07-29 12:31:05 +02:00
Cédric Salvador
c1116b672f wizard UI 2013-07-29 12:31:05 +02:00
Cédric Salvador
1c8ac0e9bb display the desiredstock field in product/liste.php 2013-07-29 12:31:05 +02:00
Cédric Salvador
4f39913146 display the desiredstock field in product/reassort.php 2013-07-29 12:31:05 +02:00
Cédric Salvador
ea2d94451a added the desired stock field to the Stock UI 2013-07-29 12:31:04 +02:00
Cédric Salvador
e36613f0f0 added the desired stock field to the create/edit product UI 2013-07-29 12:31:04 +02:00
Laurent Destailleur
1d4ce231db Add manually patch 
9ae9b2b02a
 2013-07-27 12:22:00 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
a240dba290 Fix: Translation of text 2013-07-18 19:01:19 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was 
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
 2013-07-10 17:29:54 +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
Laurent Destailleur
cba1d73dd4 Fix: Can autoselect warehouse if only one warehouse 2013-06-24 19:34:56 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Regis Houssin
cb9dcfa369 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13 New: add product price sharing for multicompany 2013-06-24 17:12:41 +02:00
Laurent Destailleur
0ab500d3a7 Merge pull request #1063 from grandoc/develop 
standardize code
 2013-06-21 08:10:01 -07: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
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Florian Henry
035edc12ce Fix [ bug #945 ] error adding a service 2013-06-19 14:41:18 +02:00
Marcos García
4532399026 CR Fix 
I'm getting tired of these commits...
 2013-06-19 09:26:20 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the 
parameter currency of method price.
 2013-06-17 11:58:55 +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
706b0d562f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-15 01:09:08 +02:00
Marcos García
829b3bfc1d CR fix 
GIt required mi to commit this changes
 2013-06-14 12:48:27 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Laurent Destailleur
396cbcec62 Fix: Do not update twice level 1 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-06-14 01:23:54 +02:00
Laurent Destailleur
99cbee6486 Fix: Do not update twice level 1 2013-06-14 01:22:38 +02:00
Laurent Destailleur
980901b557 Qual: id of an instance should not be provided into method of instance 2013-06-14 00:23:38 +02:00
Laurent Destailleur
6750987dcb Qual: id of an instance should not be provided into method of instance 2013-06-14 00:21:17 +02:00
Laurent Destailleur
5f60a7c88c Fix: Multiprices were not update by mass vat update tool 2013-06-14 00:11:57 +02:00
Laurent Destailleur
bd8f1f2d2f Fix: Multiprices were not update by mass vat update tool 2013-06-14 00:11:15 +02:00
Laurent Destailleur
d3a500d6c4 Fix: Missing price level for triggers 2013-06-13 23:26:06 +02:00
Laurent Destailleur
12c3fe2558 Fix: Missing price level for triggers 2013-06-13 23:24:58 +02:00
Laurent Destailleur
d9f5151c39 Fix: Bad default value for finished property 2013-06-13 15:53:17 +02:00
Laurent Destailleur
febe74ad17 Merge pull request #1038 from marcosgdf/clone-composition 
Clone composition
 2013-06-12 13:26:40 -07:00
Laurent Destailleur
93c71d00f7 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/class/hookmanager.class.php
 2013-06-12 22:17:15 +02:00
Marcos García
13bcb5daaa Merge branch 'develop' into clone-composition 
Conflicts:
	ChangeLog
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2013-06-12 16:39:23 +02:00
Laurent Destailleur
2483f044c5 Fix: Trans 2013-06-12 16:28:36 +02:00
Laurent Destailleur
4ba24ed8d7 Fix: Missing empty value 2013-06-11 12:58:52 +02:00
Florian Henry
8510c9c0d7 Add hook into referent product screen 2013-06-11 11:46:38 +02:00
Marcos García
e727100cf0 New: Clone product/service composition 2013-06-10 00:11:25 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Marcos García
f0454926c2 Fix bug #933: Ajax error 
Caused by commit 7e53f98
 2013-06-08 22:29:18 +02:00
Marcos García
a06de736c2 Merge branch '3.4' into translations 2013-06-08 20:29:07 +02:00
Marcos García
000de9530d Fixed wrong translation key and and improved es_ES translations 2013-06-08 20:15:48 +02:00
Marcos García
3cff899b44 Removed debug message and wrong translation key 2013-06-08 20:01:51 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
3cb6e196b6 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:31:54 +02:00
Laurent Destailleur
205ff535a9 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:30:38 +02:00
Laurent Destailleur
a1a8fac25c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-03 11:15:15 +02:00
Laurent Destailleur
6cf1d25529 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2013-06-03 11:09:40 +02:00
Marcos García
c12da33dcd Fixed empty table when few modules are activated in product card view 2013-06-02 00:37:33 +02:00
Marcos García
cf1d269f15 Avoid warnings 2013-06-01 16:11:45 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Laurent Destailleur
2cac1f4c9c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2013-05-25 18:14:15 +02:00
Florian Henry
5b02a3a67c Fix search product if multilingue 2013-05-24 22:44:26 +02:00
Florian Henry
0a041a7705 Fix multilangue search product list 2013-05-24 22:39:28 +02:00
Marcos García
edfcfb9bbd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop 
Conflicts:
	htdocs/admin/commande.php
	htdocs/admin/expedition.php
	htdocs/admin/facture.php
	htdocs/admin/fichinter.php
	htdocs/admin/livraison.php
	htdocs/admin/supplier_invoice.php
	htdocs/admin/supplier_order.php
	htdocs/societe/admin/societe.php
 2013-05-08 15:37:41 +02:00
Laurent Destailleur
fc158d1e10 Merge pull request #934 from KreizIT/develop 
Fix invalid permission test when deleting services
 2013-05-08 00:11:01 -07:00
Marcos García
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +02:00
Cedric GROSS
d1c1cf6bc0 Fix invalid permission test when deleting services 2013-05-07 12:07:06 +02:00