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

870 Commits

Author SHA1 Message Date
Shreya
3f77852e93 Pass buying or selling as filter parameters 
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
 2018-05-15 17:22:06 +05:30
Shreya
0db85067b2 Add For Buying and For Selling checkboxes in Currency Exchange 2018-05-15 12:48:10 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Zlash65
2e0809801d controller and other changes 2018-05-14 11:45:38 +05:30
Nabin Hait
b9fed2aa38 Removed company from Finance Book and related changes 2018-05-09 15:10:29 +05:30
Gaurav Naik
8cbbdfdf30 Added finance book filter to financial_statements.js 2018-05-09 15:03:05 +05:30
Shreya Shah
204c3bc37e Remove Production Planning Tool docs (#13946) 
* Remove Production Planning Tool docs

* Remove Offer Letter Occurrences

* Rename Employee Loan Occurrences
 2018-05-07 18:21:03 +05:30
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +05:30
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings (#13897) 2018-05-03 16:24:52 +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
rohitwaghchaure
0065624fe0 Tax amount showing under wrong tax header in the report (#13843) 2018-05-02 12:20:55 +05:30
Shreya
14bd43d5eb minor changes 2018-04-30 15:30:42 +05:30
Shreya
a20157af17 on item, warehouse and batch triggers, fetch serial nos based on batch 2018-04-26 14:39:21 +05:30
Prateeksha Singh
420c79041e [fix] company listing context 2018-04-05 14:44:16 +05:30
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
Prateeksha Singh
b60a52b194 Hub Market (#13325) 
* [hub] enable hub with OAuth token from user's client ID

* [hub] settings schema for adding users

* [hub] image view style listing

* [hub] broken image link fallback

* [wip]

* [hub] bootstrap timeline

* [hub] setup quick view

* [hub] reformat ratings, add companies autocomplete filter

* [hub] common listing frames

* [hub] setup sort selector

* [hub] timeline

* [hub] customize list header

* [hub] genuine form fieldtypes

* [hub] review products

* [hub] suggest missing categories remotely

* [hub] Wishlist; header and title templates

* [hub] link wishlist, remove company migration

* [hub] calculate ratings
 2018-04-03 10:44:13 +05:30
Charles-Henri Decultot
6860036b01 Agriculture module corrections (#13438) 
* Agriculture module corrections

* Update ternary_plot.js
 2018-04-02 10:51:53 +05:30
Shreya Shah
5d71609f0b Timer fixes (#13443) 
* alert for exceeded time only when dialog is open

* fetch row having an activity without from_time

* fixes if timesheet created from work order

* reset timer limit exceeded
 2018-04-02 10:32:39 +05:30
Manas Solanki
a7f5589564 fix for the update button in the sales invoice (#13435) 2018-04-02 10:32:00 +05:30
Nabin Hait
ff2e4c898a Fixed merge conflict 2018-03-29 13:57:39 +05:30
Ameya Shenoy
c5d222253a
Permisssion fixes for child table 
Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3
frappe.client.[get_list, get, get_value] when called on child table
needs parent as an argument or it throws an error by default
 2018-03-29 13:16:08 +05:30
rohitwaghchaure
68ba4fd697 [Fix] Multi-batch selection issue in POS (#13407) 2018-03-28 12:33:15 +05:30
rohitwaghchaure
a3c3dec5a2 [enhance] Item Alternative (#13121) 
* [enhance] Item Alternative

* Added two way provision in item alternative

* Test Cases

* documentation
 2018-03-28 11:51:44 +05:30
Zarrar
7f4cd3f5ea Update Docs for Work Order (#13403) 
* update docs

* rename files, update pngs

* update pngs for timesheet, leftover changes
 2018-03-27 14:59:49 +05:30
Nabin Hait
b9c82b9790 Fixed merge conflict 2018-03-27 14:25:27 +05:30
Shreya Shah
149f7ee875 [Fix] General Ledger Report (#13374) 
* error fix if party_type = student or shareholder

* clear party filter when party_type changes to avoid error throw

* dict with values of party_name in utils.js

* fetch party_name from erpnext.utils.get_party_name

* Update general_ledger.py
 2018-03-27 11:29:25 +05:30
Shreya
8bb0f05451 added task field 2018-03-23 11:46:45 +05:30
Shreya
822ba21f38 codacy fix 2018-03-23 11:41:56 +05:30
Shreya
559011404a removed timesheet.html, appended it as a helper function 2018-03-23 11:41:56 +05:30
Shreya
5bf24be704 minor fixes 2018-03-23 11:41:56 +05:30
Shreya
8f06266838 all fields editable 2018-03-23 11:41:55 +05:30
Shreya
68ec22a90c moved timer.js to public/js 2018-03-23 11:41:55 +05:30
rohitwaghchaure
6a2d073fe1
Merge pull request #13353 from PawanMeh/fixes_13352 
Add total qty to offline POS
 2018-03-22 11:36:32 +05:30
Faris Ansari
34dd079a68
Remove unnecessary columns Analytics Reports (#13344) 2018-03-22 11:12:02 +05:30
pawan
53a4d2c430 [fix] #13352 2018-03-21 09:19:36 +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
Nabin Hait
5e63c265db Fixed merge conflict 2018-03-09 17:34:39 +05:30
Nabin Hait
c3889d85a1
Update shopping_cart.js 2018-03-09 16:28:25 +05:30
rohitwaghchaure
a32e57ae82 [Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233) 2018-03-08 16:21:13 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
rohitwaghchaure
4e8fdf7b3f [Enhance] Quality Inspection Template (#12988) 
* [Enhance] Quality Inspection Template

* Test case and patch

* Update make_quality_inspection_template.py
 2018-02-22 11:03:48 +05:30
Faris Ansari
7c744acc49
Changes for Rollup (#12924) 
* Changes for rollup

* remove variables.less
 2018-02-20 14:21:50 +05:30
Jay Parikh
33b2614377 [Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966) 2018-02-16 14:45:40 +05:30
Zarrar
441a1e1b8a Validate Bank name in Setup wizard on the same slide (#12968) 
* validate bank name before moving on to next slide

* Update setup_wizard.js
 2018-02-16 14:44:42 +05:30
Shreya Shah
3a9eec2e92 Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913) 
* pass bill_date as parameter and calculate due_date on that basis

* calculate payment_schedule on the basis of bill_date if present else posting_date

* add bill_date as an argument to get_party_details

* pass bill_date on supplier trigger in purchase invoice
 2018-02-16 13:05:21 +05:30
Shreya Shah
8b531c1ee6 Fix parenthesis in buying controller (#12923) 2018-02-15 11:21:49 +05:30
Prateeksha Singh
387a242232
Merge pull request #12928 from pratu16x7/hub-pages 
Hub pages
 2018-02-15 11:05:22 +05:30
Prateeksha Singh
9889899603 [hub] cleanups 2018-02-15 10:54:23 +05:30
Prateeksha Singh
1ad072f2a9 [hub] cleanups 2018-02-15 10:47:59 +05:30
Prateeksha Singh
2073959bb8 Update entity properties 2018-02-15 10:24:16 +05:30