Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,939 Commits 3 Branches 0 Tags 1 GiB
9a31dd7062
Commit Graph

1719 Commits

Author SHA1 Message Date
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
Saurabh
0de0861bb4 Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-02-08 00:10:49 +05:30
rohitwaghchaure
b553b7a69d PDC Enhancements (#12462) 2018-02-07 18:32:51 +05:30
Nabin Hait
c224d34a2c Merge branch 'master' into develop 2018-02-07 16:07:20 +05:30
Saurabh
e26773d91e Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-02-05 17:05:29 +05:30
rohitwaghchaure
a4c40e0fd6 [Fix] After accesing POS page, it does not work when going back from another page (#12763) 2018-02-05 12:24:06 +05:30
Nabin Hait
2ef1f84041 Fixed merge conflict 2018-02-03 09:14:53 +05:30
Saurabh
70d972d92e [Mod] Added descriptions to alert about reselecting the option in 'primary_address_and_contact_detail' 2018-02-02 16:18:17 +05:30
rohitwaghchaure
cf6360d825
Merge pull request #12739 from jay-parikh/hotfix 
Enable/Disable Discount in POS using POS Profile #11748
 2018-02-02 13:12:38 +05:30
Jay Parikh
2c95ab3897 Code fix for Enable/Disable Discount in POS using POS Profile #11748 2018-02-01 22:52:58 -08:00
Jay Parikh
171e5af995 Fixed indentation issue in pull # 11748 2018-02-01 21:39:20 -08:00
Jay Parikh
d4359faa31 Enable/Disable Discount in POS using POS Profile #11748 2018-02-01 04:26:24 -08:00
Rohit Waghchaure
d85247cd7a [Fix] Pay button not working in pos 2018-02-01 17:18:38 +05:30
Saurabh
7c8d508e28 [Mod] Dependant on complete_address field and loads updated mobile_no,address in onload method 2018-02-01 14:40:49 +05:30
Saurabh
f16d45b0a0 Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 
Resolved Conflicts:erpnext/selling/doctype/customer/customer.json
 2018-02-01 02:05:30 +05:30
Saurabh
9f5c2002ff [Mod] Removed the Dependency on Frappe PR 
[Fix] Fixed a possible bug
 2018-01-31 17:43:58 +05:30
Nabin Hait
ec2c9ec897 Merge branch 'master' into develop 2018-01-31 15:39:16 +05:30
rohitwaghchaure
2056ea6fb4
Update customer.js 2018-01-31 14:48:53 +05:30
saurabh-bhosale
0c9a99a953
Merge branch 'develop' into show_address_in_online_pos 2018-01-30 17:48:12 +05:30
Nabin Hait
585254456e
Check credit limit while making DN, if bypassed on SO (#12702) 2018-01-30 12:11:22 +05:30
rohitwaghchaure
ce5b93ca77 [Fix] Allow user to edit rate in online POS (#12701) 2018-01-30 10:39:46 +05:30
Saurabh
03f6b3e588 resolved merge conflicts 2018-01-29 16:25:33 +05:30
Andy Villiger
567623654b Resolve issue #10914 - Error when making Sales Invoice (#12656) 
* Resolve issue #10914

An exception was raised when a Sales Order has been created to a Sales Invoice and one of the items had no Item Code.

* Update sales_order.py
 2018-01-26 11:11:19 +05:30
tundebabzy
f9b5c74871 set batch number only in Sales Invoice and Delivery Note 2018-01-25 19:21:05 +01:00
Saurabh
aaaf5c62b6 [Mod] Minor changes in 'primary_address' field's property 2018-01-25 17:28:57 +05:30
Saurabh
6614d8aa01 Multiple changes: 
[Mod] Added 'primary_address_and_contact_detail' in toggle_display
[Mod] Added a description for 'primary_address_and_contact_detail'
 2018-01-25 12:27:00 +05:30
Saurabh
5a2354149c Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos 2018-01-25 11:56:36 +05:30
Saurabh
cadd31cb0c [Fix] Solves issue #12588 2018-01-24 16:38:22 +05:30
Saurabh
b665baec72 Used cint instead of int 2018-01-23 18:28:05 +05:30
Saurabh
a5c9fc3705 Removed commented code 2018-01-23 17:36:41 +05:30
Saurabh
cbbee47625 [Fix] Resolved the type issue of 'is_saved' flag variable 2018-01-23 17:23:27 +05:30
Saurabh
a2076a1ff0 Multiple changes: 
[Mod] Used async-await for asynchronous save in draft mode
[Fix] Fixed bug that din't allow to submit a new POS Invoice
 2018-01-23 17:23:26 +05:30
Saurabh
c5a6cf3a0e [Mod] Allows print only when the check value exists and the cart isn't empty 2018-01-23 17:23:26 +05:30
Saurabh
32695a938f [Mod] Refactored the code for fetching allow_print_before_pay check value 2018-01-23 17:23:26 +05:30
deepak-mnt
d7da89bf5a [Fix] Resolved issues suggested by Codacy 2018-01-23 17:21:44 +05:30
deepak-mnt
8f3d394485 Minor changes:Removed extra spaces in py code 2018-01-23 17:21:44 +05:30
deepak-mnt
cc813d2286 [Mod] Ensured that a single POS Sales Invoice is created even when its printed(saved) in Draft mode 2018-01-23 17:21:44 +05:30
deepak-mnt
1ccb0cfa2f [Mod] point_of_sale.js: Allowed print before pay and saved the invoice before print 
[New] test_point_of_sale.js: Test Cases to check the print before pay functionality in Online POS
 2018-01-23 17:21:44 +05:30
deepak-mnt
29abe291c9 Allow draft mode print in online POS 2018-01-23 17:21:44 +05:30
Saurabh
24946ee4e0 Codacy fix 2018-01-20 04:28:35 +05:30
Saurabh
b664488d98 [Fix] Clears off the read-only fields in 'Primary Address and Contact Details' Section on blank link fields 2018-01-20 03:12:45 +05:30
Saurabh
24cae1cad6 Made Primary address field searchable and is displayed in Customer Link field options 2018-01-20 02:47:19 +05:30
Nabin Hait
570e29d5e7 Fixed merge conflict 2018-01-17 18:56:02 +05:30
Faris Ansari
4d4ce3e5cf Rename enquiry_type to opportunity_type in MultiSelect dialog (#12517) 2018-01-17 14:40:27 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale (#12514) 
* GL Entry on asset sale

* Asset sale test case fixed
 2018-01-17 14:39:05 +05:30
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30
rohitwaghchaure
7b78f6bee6 Added rounded total in the POS and fix rounded issue in js side (#12457) 2018-01-12 16:28:16 +05:30
tundebabzy
df023bff7f add posting_date/transaction_date to list_view (#12453) 2018-01-12 16:27:29 +05:30
rohitwaghchaure
3955fa5102 [Fix] Email addres unique key issue (#12450) 2018-01-11 18:21:02 +05:30
rohitwaghchaure
5b45bcf5f3 [Fix] Report Available Stock for Packing Items Menu not working (#12400) 2018-01-11 12:39:09 +05:30
tundebabzy
76dddbf26e
Merge branch 'develop' into multi-barcode 2018-01-10 21:49:27 +01:00
Vishal Dhayagude
0099a09e9b [fix] fix print hide weight details in quotation print format (#12412) 2018-01-10 16:30:09 +05:30
rohitwaghchaure
7fcc21bc8b [Fix] Cart remain same even if pos profile change (#12371) 2018-01-08 15:22:22 +05:30
rohitwaghchaure
bc2c83ee3c Companywise default tax template (#12290) 
* Companywise default tax template

* Fix test cases
 2018-01-05 12:42:02 +05:30
rohitwaghchaure
3f784a7a49 [minor] POS profile mandatory, to set as default (#12307) 2018-01-05 12:26:33 +05:30
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms (#12115) 2017-12-20 12:24:59 +05:30
rohitwaghchaure
b725affe0c [fix] Mobile no search issue in the pos (#12090) 2017-12-19 11:21:00 +05:30
rohitwaghchaure
e067beda49 [fix] Promise issue, in cart against item displaying zero values (#12078) 2017-12-18 12:32:49 +05:30
rohitwaghchaure
78a17355be [fix] Item search in POS (#12037) 2017-12-15 15:38:12 +05:30
rohitwaghchaure
5a344576b8 [minor] Address fix (#12025) 2017-12-15 13:14:36 +05:30
Vishal Dhayagude
d377018695 [fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001) 
* [wip] shipping rule

* [wip] Shipping Rule tax auto calculate

* [wip] Shipping Rule

* [new] Shipping charges change on different triggers

* [minor] Removed unnecessary comments

* [fix] Minor Changes in function calls
 2017-12-14 18:06:02 +05:30
rohitwaghchaure
2b95a5438b POS batch fixes (#12005) 2017-12-14 16:06:23 +05:30
rohitwaghchaure
24e5265281 [enhance] Search customer using primary contact mobile number (#11998) 
* [enhance] Search customer using primary contact mobile number

* Update build.json
 2017-12-14 13:06:21 +05:30
Nabin Hait
0f97eda7c9 Merge branch 'master' into develop 2017-12-12 19:17:53 +05:30
Charles-Henri Decultot
d18423d9c7 Project Margin Calculation Improvement (#11911) 
* Project Margin Calculation Improvement

* Documentation modification

* Change Total Planned Sales to Total Sales Amount

* Change documentation screenshot
 2017-12-12 14:59:59 +05:30
Nabin Hait
de1e29bf1b
Production Order fixes (#11951) 
* Production Order from Sales Order fixes: Validate SO and set required items on save

* Codacy fixes
 2017-12-12 13:22:48 +05:30
rohitwaghchaure
d19be49889 [fix] Error opening the POS (#11929) 2017-12-11 14:57:43 +05:30
Giovanni
2144e02d3c - Added multiple barcode feature per item 2017-12-10 17:27:09 +01:00
Zarrar
17fd6610dc Fix travis (#11882) 
* fieldname wrong

* bifurcated test into two - error when both were running async

* minor fixes with link and route

* move school domain rename up

* fix async creation of operations test

* edit-in-full-page is button, not link

* set_route issue in production order test

* minor changes

* fix task tree test

* more fixes

* fix server side issue

* improvising ui tests
 2017-12-08 14:57:38 +05:30
Zarrar
c47745ea83 only fetch distinct names of events (#11846) 2017-12-04 19:23:20 +05:30
Saurabh
34a0e90115 [fix] merge conflicts 2017-11-30 16:45:01 +05:30
Nabin Hait
e761b9de40 Rearranged fields due to merge conflict messup 2017-11-30 14:29:10 +05:30
tundebabzy
ce63ab7602 Show Batch Selector Dialog Only If There Are Multiple Batches (#11794) 
* check if multiple batches available before showing dialog

* Update point_of_sale.js
 2017-11-30 11:38:53 +05:30
tundebabzy
8ae53cacc5 When Warehouse Field Is Changed, Batch Number Field Should Be Updated (#11789) (#11790) 
* reset batch_no field if no batch number returned

* on warehouse change, query for batch number
 2017-11-30 11:37:21 +05:30
Shreya
c0c470b56d fixed json affected by latest merge 2017-11-29 19:31:15 +05:30
Rushabh Mehta
0154538c06 [fix] [minor] pos.js 2017-11-29 16:42:02 +05:30
rohitwaghchaure
1b344ca81e [Fix] POS not loading if pos profile not defined (#11778) 2017-11-29 16:21:51 +05:30
Vishal Dhayagude
d42242df22 [Feature] Shipping Rule Calculation based on Net Weight (#11770) 
* [new] Calculate shipping tax based on weight

* [fix] Change field name weight to weight_per_unit in SI Item

* [new] Shipping Rule based tax for selling module

* [new] Shipping rule based on weight added to Buying module

* [fix] Conflict in jsons

* [fix] Removed Redudant add_fetch

* [fix] Codacy fixed

* [fix] Print hide added
 2017-11-29 16:09:59 +05:30
rohitwaghchaure
f591a220c9 Fetch items of item groups defined in the pos profile (#11763) 2017-11-29 13:55:13 +05:30
tunde
0d82b6979e add missing field and value parameters 2017-11-28 23:30:03 +01:00
rohitwaghchaure
c037dc775e Refactor multi pos profile selection in the pos invoice (#11721) 2017-11-28 16:11:15 +05:30
rohitwaghchaure
a14baf4188
Merge pull request #11739 from rohitwaghchaure/payment_terms_test_case 
[fix] payment terms test case
 2017-11-27 12:05:57 +05:30
Charles-Henri Decultot
22641e44ad Allowing the creation of an Oganization as Lead (#11724) 
* Allow the creation of an organization lead

* Changes following test fails

* Test case correction
 2017-11-27 11:58:22 +05:30
Rohit Waghchaure
52bf56d415 [fix] payment terms test case 2017-11-27 11:43:52 +05:30
rohitwaghchaure
15f8fe0179 [fix] Batch selected in the sales transaction for non batch item (#11713) 2017-11-24 10:46:27 +05:30
Nabin Hait
aa5b566ea9 Merge branch 'ashish-greycube-feature_10861-1' into develop 2017-11-23 17:49:25 +05:30
Nabin Hait
68768252ce Cleanup and fixes on bypass credit limit check on sales order 2017-11-23 17:48:59 +05:30
Rohit Waghchaure
09b39f06ea Code cleanup 2017-11-23 16:30:10 +05:30
Nabin Hait
57952f6946
Merge branch 'develop' into feature_10861 2017-11-23 16:12:55 +05:30
tundebabzy
acccdb3890 Default batch number selection (#11454) 
* fetch batch_no in `get_basic_details`

* PEP8 changes and docstring

* only auto-fetch batch number for Sales documents:
otherwise, automatic batch creation will not work properly because all new
stock will be added to old batch

* new function to fetch batch number using FEFO:
FEFO - First Expiring First Out

* fetch batch number in `get_basic_details` using FEFO

* add new function - `set_batch_number`

* `set_batch_number` when `qty` is triggered

* `set_batch_number` when `uom` is triggered

* whitelist `get_batch_no_fefo`

* code clean up

* move `set_batch_number` to conversion_factor instead of uom

* rename `get_batch_no_fefo` to `get_batch_no`

* fix test case

* final cleanup

* Revert "fetch batch_no in `get_basic_details`"

This reverts commit dd024b1eb369eaeafab28165d523fb7a9f8ab8d3.

* fix test case

* update Sales Invoice manual

* move changes away from `transaction.js`

* query should not fetch expired batches

* refactor `get_batch_no`:
add new function `get_batches`

* Update batch.py
 2017-11-23 13:05:15 +05:30
Nabin Hait
82027ea3bf Set print hide property for payment terms 2017-11-23 12:49:42 +05:30
Saurabh
ed4191ec5b [fix] merge-conflicts 2017-11-22 18:01:56 +05:30
Nabin Hait
32a62a02df Fixed merge conflict 2017-11-21 20:18:03 +05:30
Nabin Hait
cc884578b5
Update sales_order.py 2017-11-21 12:24:03 +05:30
rohitwaghchaure
834541a7e8 [fix] Added primary action in the modal which will show on the submission in the pos (#11575) 2017-11-20 11:31:53 +05:30
Rohit Waghchaure
77940493a8 [fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment 2017-11-18 19:06:31 +05:30
Rushabh Mehta
30dc9a14c6
[feature] [refactor] Shipping Rule for Buying + Refactor (#11628) 
* Shipping rule for Buying

* [refactor] shipping rule
 2017-11-17 14:31:09 +05:30
Saurabh
66e65dc104 [fix] merge-conflicts 2017-11-17 14:03:13 +05:30
Rohit Waghchaure
44f7b157ff [fix] POS redirect issue 2017-11-17 13:52:11 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms 2017-11-17 12:41:56 +05:30
ashish
f17ca7866a removed names from comments 2017-11-16 11:08:14 +05:30
ashish
604eb9d689 added flag to function get_customer_outstanding and removed names in comments 2017-11-16 11:05:59 +05:30
ashish
a20c8dbd5c instead of caller as 3rd arg added a flag 2017-11-16 11:03:39 +05:30
ashish
a1feb32891 added json for bypass credit limit checkbox 2017-11-16 11:01:43 +05:30
ashish
62155fa0e5 Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861 2017-11-16 10:47:44 +05:30
Zarrar
24b8aa2e80 set field dependent on link field fix (#11580) 2017-11-15 14:27:00 +05:30
Nabin Hait
10823e5a25 Merge branch 'neilLasrado-develop1' into develop 2017-11-14 17:40:45 +05:30
Nabin Hait
b55e98570f Minor fixes 2017-11-14 17:40:30 +05:30
Shreya Shah
be690ef817 Rate with margin in customer and company currency (#11437) 
* field for company margin

* added base_rate_with_margin

* calculate company margin

* test for item price

* test for delivery note

* test for sales order

* test for quotation

* test for sales invoice
 2017-11-14 17:22:41 +05:30
Nabin Hait
cd13a28417 Get items from quotation in sales invoice 2017-11-14 17:13:53 +05:30
AravindPranera
86e726158b Getting Quotation Document in Sales Invoice 2017-11-14 17:13:53 +05:30
tunde
ffa659fd2c Merge branch 'develop' into payment-terms 2017-11-14 09:59:45 +01:00
Prateeksha Singh
17b7209032 remove erroneous column breaks (#11522) 2017-11-10 18:54:03 +05:30
Prateeksha Singh
731b66b788 remove erroneous column breaks (#11523) 2017-11-10 18:53:52 +05:30
Saurabh
a5275a1ba9 Merge branch 'master' into develop 2017-11-10 15:53:44 +05:30
Rohit Waghchaure
a5e3c3a79f Add item directly in the cart only if serial no, batch, barcode has enter in the search field 2017-11-10 15:29:26 +05:30
Pawan Mehta
1368ba00bc [fix] #11337 (#11339) 2017-11-10 14:59:26 +05:30
Nabin Hait
ff73646212 Made POS Profile mandatory and changed test order 2017-11-08 14:34:38 +05:30
Saurabh
98aa544f25 Merge branch 'master' into staging 2017-11-08 12:18:50 +05:30
Saurabh
f41b13b736 [fix] merge-conflicts 2017-11-08 12:18:41 +05:30
Sushant Nadkar
72c40f0383 Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440) 2017-11-08 11:35:46 +05:30
Rohit Waghchaure
57cc924d29 [Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart 2017-11-06 18:42:37 +05:30
rohitwaghchaure
bcb7854340
Merge pull request #10982 from netchampfaris/multiple-users-pos-profile 
[Enhancement] Allow Multiple users in POS Profile
 2017-11-06 16:45:01 +05:30
Faris Ansari
cbaa0e629c fix codacy 2017-11-03 11:35:49 +05:30
Saurabh
62fd4007b0 Merge branch 'master' into staging 2017-11-02 12:14:42 +05:30
Saurabh
3be72ef187 Merge branch 'master' into develop 2017-11-02 12:14:41 +05:30
Faris Ansari
3d59179205 Load default pos profile if not found 2017-10-31 21:56:16 +05:30
Rohit Waghchaure
5ec9f6930b [Fix] Getting an error while making delivery note from sales order and sales order has no item code 2017-10-31 15:26:56 +05:30
Faris Ansari
895aa7b7ac fix codacy 2017-10-30 17:12:50 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile 2017-10-30 15:00:55 +05:30
ashish
b883e4ee0d customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set. cint function is added. 2017-10-26 20:32:08 +05:30
ashish
751b05f1e8 sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice. cint function is added. 2017-10-26 20:15:24 +05:30
ashish
9dfc0f32ab customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. It is default to 0. Also patch is added to update value of new field to 0 after migrate. 
test_customer.js -- It is auto generated file as customer.json is modified. And it is removed.
 2017-10-26 20:07:32 +05:30
tunde
14e97ce0c8 Merge branch 'develop' into payment-terms 2017-10-26 13:35:42 +01:00
Nabin Hait
c799a22d55 Merge branch 'master' into staging 2017-10-26 14:35:34 +05:30