Shreya Shah
e329038aaa
Total Quantity in Sales and Purchase DocTypes ( #14114 )
...
* Add field to all sales and purchase doctypes
* Add patch to update existing records
* Modify taxes_and_totals.py
2018-05-28 11:49:08 +05:30
Zarrar
c141eb00ee
[Enhance] Department added wherever applicable ( #14121 )
...
* set All Department as default parent_department
* add department field in employee_transfer
* copied data from options to fetch_from
* add department field wherever employee's link field present
* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop
2018-05-22 09:18:38 +00:00
Nabin Hait
19ce904030
Report added in Selling module
2018-05-21 11:07:04 +05:30
Nabin Hait
2cfc247d88
customers without any sales transactions
2018-05-21 11:03:02 +05:30
Nabin Hait
1bf2576e0e
Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818
2018-05-21 10:47:40 +05:30
Basawaraj
6d334b8135
Added Report : Customers Without Any Sales Transactions
2018-05-17 16:54:03 +05:30
Manas Solanki
38667ab8da
return defaults according to the company
2018-05-16 17:00:05 +05:30
Rohit Waghchaure
23942701f1
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
2018-05-16 15:41:00 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts
...
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Manas Solanki
bbd8508783
optimize the patch
2018-05-16 13:00:56 +05:30
Manas Solanki
b16a4ec79e
changes for the default cost center
2018-05-16 13:00:56 +05:30
Rushabh Mehta
0b628386de
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
Shreya Shah
4f40b2dca5
[Fix] Sales Person Reports ( #13987 )
...
* Fix Sales Person Reports
- Show quantity and amounts based on the delivered quantities if the Sales Order has been closed and all quantities weren't considered for further transactions.
* Fix codacy
* Modify as per the review comment
2018-05-16 11:22:59 +05:30
rohitwaghchaure
e48b47fc0c
Production Plan, do not consider the sales orders against which work order has been created ( #13800 )
...
* Production Plan, do not consider the sales orders against which work order has been created
* Added test cases
2018-05-16 11:07:55 +05:30
rohitwaghchaure
9a0aea8abc
Merge pull request #14046 from shreyashah115/min-fix
...
[Minor] Fixes for Customer DocType
2018-05-15 16:30:46 +05:30
Shreya
8e386167b8
Set Mandatory from client-side
2018-05-15 16:09:53 +05:30
Shreya
f636503dc1
[minor] Fix customer doctype
2018-05-15 15:57:27 +05:30
Saurabh
62a59301ef
[fix] resolved merge conflicts
2018-05-15 13:02:40 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Zlash65
0a50554417
doctype level changes
2018-05-14 11:45:38 +05:30
Faris Ansari
f2b3307136
Remove escaped customer string ( #13986 )
...
- no need to escape strings that are passed to the values parameter of the sql method
- this query was failing for inputs like "D'Arby" which have quotes
2018-05-11 21:07:27 +05:30
Zarrar
f2df7f32fa
update subscription to auto_repeat across dashboards ( #13956 )
2018-05-08 16:06:36 +05:30
Nabin Hait
fdc67a577f
Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations
2018-05-07 13:12:16 +05:30
Nabin Hait
4bbe5fbefc
Fixes related to auto repeat
2018-05-05 12:32:59 +05:30
KanchanChauhan
f4feedace4
Allow changing of Address after Submit ( #13747 )
2018-05-03 19:08:54 +05:30
Suraj Shetty
00cced12a0
Success Action ( #13666 )
...
* success action config for sales invoice
* remove "Notification Control" doctype and its usage
* add default success action after_install or while migration (patch)
* rename for_doctype to ref_doctype
* case change
* minor fix
* Remove unnecessary code
* Replace message with translatable message
* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Zarrar
6f3594b2e4
[Enhance] GL Entry - ability to multiselect party ( #13769 )
...
* change dynamic link to multiselect field and improv
* print based fix
* refactor changes according to multiselect changes
2018-05-03 19:00:43 +05:30
Prateeksha Singh
a7c6ff8f3e
Merge pull request #13837 from shreyashah115/serial-batch-linking
...
Serial No. and Batch No. linking
2018-05-02 15:11:19 +05:30
Shreya
7946ca216e
Internal Customer check in Customer
2018-05-02 14:34:14 +05:30
Shreya
eb54331d5f
removed color field from sales order and work order
2018-05-01 18:56:06 +05:30
Shreya
a7b2fc9250
color field for calendar in sales order and work order
2018-05-01 18:55:17 +05:30
Nabin Hait
3652a62b55
minor fixes
2018-04-30 19:32:29 +05:30
Shreya
a20157af17
on item, warehouse and batch triggers, fetch serial nos based on batch
2018-04-26 14:39:21 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Rohit Waghchaure
8441dd9184
[Fix] Item with special character not adding in the POS cart
2018-04-19 12:55:06 +05:30
tundebabzy
caae0f4dcc
Merge branch 'develop' into new-subscription
2018-04-17 09:34:04 +01:00
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
rohitwaghchaure
e72bde5159
Removed expired items from the list of POS items ( #13582 )
2018-04-12 13:26:11 +05:30
Nabin Hait
c10e106f8f
Optimization related to large number of items ( #13606 )
2018-04-12 13:25:03 +05:30
KanchanChauhan
4691af6348
Get Payment Schedule from Sales Order to Sales Invoice ( #13497 )
2018-04-06 11:23:19 +05:30
Suraj Shetty
97d84eb509
remove apply user permission ( #13505 )
2018-04-05 12:10:46 +05:30
Rohit Waghchaure
920a3ff0b8
[Fix] POS freeze when rate button pushed
2018-04-04 18:06:19 +05:30
Rohit Waghchaure
5e0cabc538
[Fix] POS not opening
2018-03-30 14:29:18 +05:30
rohitwaghchaure
68ba4fd697
[Fix] Multi-batch selection issue in POS ( #13407 )
2018-03-28 12:33:15 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
rohitwaghchaure
85f63a3866
[Fix] Showing to bill even if per deliverd in sales order is 99.9996 ( #13392 )
2018-03-27 11:31:44 +05:30
rohitwaghchaure
c9a1eb1081
[Fix] Not able to delete row in modal table ( #13377 )
2018-03-27 11:26:43 +05:30
Faris Ansari
34dd079a68
Remove unnecessary columns Analytics Reports ( #13344 )
2018-03-22 11:12:02 +05:30
Zarrar
13ddc7e188
[ Enhance ] Production to Work Order ( #12902 )
...
* remove occurrences of Production Order
* rename from report and jsons
* Change Production Order to Work Order
* change occurences of production order from other files
* resolve minor conflict issues and reports
* patch added
* codacy fix
* updated patches, leftover changes
* rename reports, rectify patches
2018-03-20 12:38:43 +05:30
Mark Walker
f572522f25
Copy source project into Purchase Order Item ( #13321 )
2018-03-20 12:06:04 +05:30
Nabin Hait
bb5caf8fad
Merge branch 'master' into develop
2018-03-14 13:33:38 +05:30
Nabin Hait
363cedde76
Fixed minor issue
2018-03-14 13:32:14 +05:30
Nabin Hait
d21ad807b5
Merge branch 'master' into develop
2018-03-13 18:13:44 +05:30
Shreya Shah
7acc8cb747
fix else condition ( #13295 )
2018-03-13 18:12:19 +05:30
Nabin Hait
3707242770
Fixed merge conflict
2018-03-13 16:15:41 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI ( #13290 )
2018-03-13 15:46:59 +05:30
tundebabzy
0125f7b130
rename to Subscription and transfer present Subscription records to Auto Repeat in frappe
2018-03-12 13:51:47 +01:00
Nabin Hait
5e63c265db
Fixed merge conflict
2018-03-09 17:34:39 +05:30
Suraj Shetty
f2d28ebd6a
Data import Tool bug fix ( #13165 )
...
* fixes #13064
* commonified naming series checks
* test fixes
replaced test employee names according to naming series
2018-03-09 12:33:13 +05:30
Shreya Shah
aadd30d194
fetch delivery date on add-row only if item_code exists ( #13250 )
2018-03-09 12:19:35 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
Zarrar
2550180a05
remove updating territory for customers on change ( #13162 )
2018-03-05 12:32:41 +05:30
Manas Solanki
5fd7b3bb80
Fix status updater ( #13033 )
...
* fix the status updater for multiple sources
* patch for updating the status
* patch for updating the sales order item
* Update update_status_for_multiple_source_in_po.py
2018-03-05 11:28:29 +05:30
Nabin Hait
a645f36b2b
Get valuation rate from historical SLE even if it is zero ( #13129 )
...
* Don't overwrite start and end date comes from payroll entry
* Get valuation rate from historical SLE even if it is zero, if records exists
* Valid till should be autoset if not any default value
* Set status of expense claim based on is_paid check
2018-03-01 10:31:24 +05:30
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Achilles Rasquinha
96698c9a77
Use range instead xrange ( #13128 )
...
* Use range instead of xrange
* convert float to int
2018-02-28 16:12:51 +05:30
Nabin Hait
3b43c0d160
Update territory and customer_group patch optimization ( #13076 )
...
* Update territory and customer_group patch optimization
* Update update_territory_and_customer_group.py
2018-02-27 15:57:14 +05:30
Zarrar
96002c28bd
optimize patch for faster execution ( #13068 )
2018-02-27 15:57:01 +05:30
Zarrar
91fc1a8fbe
Update Territory & Customer Group across all transaction ( #13004 )
...
* added method for update query based on changes
* patch added
* updated function, moved util function
2018-02-27 15:56:38 +05:30
Rohit Waghchaure
3edc101957
[Fix] POS discount issue
2018-02-26 13:25:58 +05:30
tundebabzy
9360f81b94
Validity of Quotation #12858 ( #13078 )
...
* add new setting for default valid_till date
* codacy cleanup
2018-02-26 12:23:41 +05:30
Nabin Hait
2572b05b35
Update territory and customer_group patch optimization ( #13076 )
...
* Update territory and customer_group patch optimization
* Update update_territory_and_customer_group.py
2018-02-25 10:45:24 +05:30
Zarrar
4a0d27078e
optimize patch for faster execution ( #13068 )
2018-02-23 17:41:32 +05:30
Nabin Hait
7570774ebe
Merge branch 'master' into develop
2018-02-23 16:49:43 +05:30
Shreya Shah
d5b2e39f45
improve validation ( #13058 )
2018-02-23 16:23:57 +05:30
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
Zarrar
79756c44c9
Update Territory & Customer Group across all transaction ( #13004 )
...
* added method for update query based on changes
* patch added
* updated function, moved util function
2018-02-22 10:57:49 +05:30
Shreya Shah
8a77a0e1e4
Add total row in all trends reports ( #13010 )
...
* total in sales order trends report
* total in all trends reports
2018-02-21 14:46:07 +05:30
rohitwaghchaure
554f2de23d
Code cleanup online POS ( #12985 )
2018-02-20 11:18:01 +05:30
Shreya Shah
5448318146
fix total field ( #12992 )
2018-02-19 12:44:52 +05:30
Achilles Rasquinha
0bf19a1ac5
Merge pull request #12931 from achillesrasquinha/py3-iteritems
...
Py3 iteritems
2018-02-15 13:49:43 +05:30
Achilles Rasquinha
1697a7aa81
replaced string_types with basestring
2018-02-15 11:39:45 +05:30
Achilles Rasquinha
714c7465fb
Updated Python 3 fixes
2018-02-15 11:31:05 +05:30
Saurabh
2735701aab
resolved merge conflicts
2018-02-14 11:51:09 +05:30
rohitwaghchaure
8e675ebbe2
[Fix] Price list exchange rate is not visible when base currency and price list currency is different ( #12898 )
2018-02-13 17:11:06 +05:30
Faris Ansari
5a91989665
Remove total_projected_qty ( #12889 )
2018-02-13 16:00:52 +05:30
saurabh-bhosale
ed35a296ab
closes #12872 ( #12888 )
2018-02-13 14:40:59 +05:30
saurabh-bhosale
99eb30242d
[Fix] Bug fix in customer_primary_address frappe call ( #12880 )
2018-02-13 07:58:47 +05:30
Nabin Hait
662b23ce57
get address display in customer
2018-02-12 19:25:00 +05:30
Nabin Hait
4adcced9ae
Merge branch 'show_address_in_online_pos' of https://github.com/mntechnique/erpnext into mntechnique-show_address_in_online_pos
2018-02-12 19:14:38 +05:30
Nabin Hait
e21e59614f
Fixed merge conflict
2018-02-12 15:59:55 +05:30
rohitwaghchaure
7477899d2e
Formatter, code cleanup ( #12852 )
2018-02-12 11:25:58 +05:30
rohitwaghchaure
7e75165826
Merge branch 'develop' into fixes_12829
2018-02-09 12:01:41 +05:30
Saurabh
0f3c4fa7a7
Codacy fix - used classmethod decorator
2018-02-09 11:30:11 +05:30
Saurabh
c29f3c70dc
Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
2018-02-09 10:51:49 +05:30
Saurabh
b4ab89e1da
[Mod] Code refactored to remove dependency on 'complete_address' field
2018-02-09 10:49:30 +05:30
pawan
735b8c6094
[fix] #12829
2018-02-08 16:20:46 +05:30
Saurabh
ab8c7e616e
resolved merge conflicts
2018-02-08 15:17:15 +05:30
Saurabh
056c1709c6
Fixes #12810
2018-02-08 00:22:53 +05:30