8 Commits

Author	SHA1	Message	Date
Anurag Mishra	de5237fbd5	refactor: Report BOM Sock Calculated (#19431)	2019-12-02 17:08:12 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Faris Ansari	504f317434	fix: BOM Stock Calculated Report (#16585) ... - Cast null values to 0 to avoid mathematic errors	2019-02-07 07:15:38 +05:30
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287) ... * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Manas Solanki	ee32a78e9f	Update bom_stock_calculated.py	2018-06-29 13:33:32 +05:30
Nabin Hait	7324815fdb	map payment terms template from SO to SI	2018-06-28 23:12:02 +05:30
Ranjith Kurungadam	ce26610d39	Fix tax calculation (#14635) ... * Salary Detail - field is_additional_component * TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax * fix indentation	2018-06-22 15:39:49 +05:30
umaepoch	0484547150	BOM Stock Calculation Report (#14561) ... * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * Update bom_stock_calculated.json	2018-06-21 11:27:54 +05:30