Sunny
962cef470a
Set PO Reqd By Date default in code, to next date
2017-10-02 11:35:33 +08:00
Sunny
0f73f90fa2
[fix] Codacy errors
2017-10-02 11:35:33 +08:00
Sunny
69e88ffa39
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:35:33 +08:00
schilgod
f29969a5cc
update test records
2017-10-02 11:35:32 +08:00
Sunny
e3ed8b7cb3
[fix] tests
2017-10-02 11:35:32 +08:00
Sunny
c429a6e688
[fix] Codacy errors
2017-10-02 11:35:32 +08:00
Sunny
2315a79b5f
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:35:32 +08:00
Sunny
9da25f568d
Set PO Reqd By Date default in code, to next date
2017-10-02 11:35:32 +08:00
Sunny
9d497a984b
[fix] Codacy errors
2017-10-02 11:35:32 +08:00
Sunny
bb03ec103b
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:35:32 +08:00
tunde
c49e748c85
Merge branch 'develop' into payment-terms
2017-09-29 13:30:22 +01:00
Shreya Shah
b79c4a9ff6
Getting last purchase price of an item ( #10897 )
...
* Added a column last purchase rate
* Removed button last purchase rate
* Get last purchase rate on adding an item
* Added test case for last purchase rate
* Replaced cur_frm with frm
* Update purchase_order.js
2017-09-29 15:20:48 +05:30
tunde
3415ac6e9c
Merge branch 'develop' into payment-terms
2017-09-29 10:10:24 +01:00
Sunny
bf68611567
clean code
2017-09-28 15:24:11 +08:00
Sunny
892ec599d4
[fix] tests
2017-09-28 15:23:09 +08:00
Sunny
799d69baba
[fix] Codacy errors
2017-09-28 15:22:49 +08:00
Sunny
71866e06f3
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:49 +08:00
Sunny
284ceb7abe
Set PO Reqd By Date default in code, to next date
2017-09-28 15:22:49 +08:00
Sunny
65c7a6947a
[fix] Codacy errors
2017-09-28 15:22:49 +08:00
Sunny
f7a8277d12
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:49 +08:00
Nabin Hait
c9f9e5235b
Fixed merge conflict
2017-09-28 12:31:33 +05:30
Makarand Bauskar
53e19075d1
[hotfix] fixes and refactored Quoted Item Comparison report ( #10954 )
2017-09-28 12:30:04 +05:30
tunde
9e4dcdfbc8
rename Payment Terms Schedule section break to Payment Terms
2017-09-26 09:44:23 +01:00
tunde
8a53b64ac4
Merge branch 'develop' into payment-terms
2017-09-25 10:31:42 +01:00
tunde
cf42d1db5c
more tests
2017-09-22 17:20:33 +01:00
Nabin Hait
5478a7fa67
Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop
2017-09-21 15:48:18 +05:30
tunde
c02f332565
Merge branch 'develop' into payment-terms
2017-09-20 15:37:34 +01:00
Nabin Hait
b2dca79d89
Updated modified timestamp in sales/purchase transaction doctypes
2017-09-20 09:56:06 +05:30
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
Nabin Hait
2e4de83df6
Rounding Adjustment via a separate field, instead of last tax row ( #10659 )
...
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
2017-09-19 14:53:16 +05:30
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
AravindPranera
1276893550
Files added with all functions
2017-09-18 17:30:20 +05:30
tunde
9448f4b13c
codacy corrections
2017-09-18 12:08:34 +01:00
Saurabh
590d401e5f
[fix] if bom specified on purchase order item then don't pull default bom in purchase receipt ( #10793 )
...
* [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt
* Update bom.js
* Update stock_entry.py
2017-09-18 15:49:19 +05:30
Nabin Hait
092f6d3739
Fixes ui tests
2017-09-14 16:45:47 +05:30
Rushabh Mehta
f056974bc5
[domain] Healthcare ( #10664 )
...
* Medical module for erpnext
* Changes in core for Medical module
* patient registration updated
* fix - appointment invioce - fields missing
* pages- indicator instead of bg-color
* Lab Test field renamed service type
* Department added Lab Test
* procedure name in prescription
* fixes sample collection
* filter disabled patient
* fix patient admission
* updated patient age
* availability check msg updated
* fixes, removed procedure from invoice
* sample print renamed
* fixes, validation
* service desk physician in filter
* refactor scheduler
* Appointment -field property - set only once = 1
* Appointment - Mark closed and pending buttons removed
* Appointment - readonly = 1 if value set
* Appointment - availabilty
* Appointment - Cancel - info - cancel invoice
* Appointment - set pending appointments
* Dosage form - new DT
* Drug Prescription - Dosage form added
* Facility - Floor - removed from Fecility
* Floor - removed
* Lab Test Template - item creation validation
* Procedure - Create Procedure
* Procedure Appointment - new DT
* Service Unit - Floor reference removed
* Zone Fcilities - Unused DT removed
* Appointment Desk - fixed
* Service Desk - method pointing from procedure changed to procedure_appointment
* Consultation print - got featured
* Consultation - removed patient refernce to procedure prescription
* Procedure Prescription - removed patient refernce
* Lab Test - Changed field properties and value
* Lab Test - field property changed
* Lab Test - methods rewrite - lab test doc creation
* Lab Test - create lab test from invoice and consultaion - got changed
* Button History changed to Medical Record
* Service Desk - Updated
* Notification - Procedure Appointment
* fix-get procedure prescription
* fix field added to test prescription
* msgprint on invoice creation
* fix data on install
* Merge branch erpnext/develop
* fixes- minor
* Setup wizard - Create Sensitivity
* Appointment - Validate and Save if there is no schedule for Physician
* Consultation - Button create vital signs and medical record
* Review Type - New DocType
* Review Detail and Treatment Plan - Childs - Consultation
* Patient Medical Record - field Attach doc
* Consultation - New Fields
* Consultation - Manage new Fields - Medical record add action
* Patient Relation - Child DocType - Patient
* Patient - Patient Relation added
* Patient - collapsible = 1
* Laboratory Settings - fields - message for lab test
* Laboratory Settings - get message for lab test
* SMS text for lab test and invoice test report
* Procedure Stock Detail - Stock detail for Procedure and Template
* Template Stage Detail - Stage detail for Procedure Template
* Procedure Stage Detail - Stage detail for Procedure
* Service Unit - field - warehouse
* Scheduler - msg - content changed
* Laboratory Settings - defualt - msg content
* Invoice Test Report - msg print
* Print Format-Changed-Consultation-Invoice Test Report-Lab Test
* OP Settings - Expnse Account for Stock Entry in Procedure
* Procedure and Procedure Template - Manage Stock Stage and Sample Collection
* Procedure Appointment - Manage Stock and Stage
* Lab Test - fixed - resource not find
* Invoice Test Report - fixed - resource not find
* Procedure - doc reload after insert
* Patient Medical Record - fixed - refernce missed
* Create Vital Signs -on client side
* Rename module Medical to Healthcare
* Remove In Patient (IP) Feature.
* Rename - Procedure to Clinical Procedure
* Remove spaces in Naming Series
* Rename Duration to Drug Prescription Duration
* Duration to Drug Prescription Duration
* Merge All Settings to Healthcare Settings
* Healthcare settings - import fixed
* Procedure related documents are removed
* Appointment Desk and Sevrvice Desk are removed
* Consultation - minimal
* Consultation - minimal
* Consultation - minimal - patient detials in collapsible section
* Message Print to Alerts
* Patient - some fields removed
* Patient - create consultation - message print to alerts
* Consultation - show patient details updated
* Setup wizard - Duration to Drug Prescritpion Duration
* Healthcare Settings - patient registration - fee collection
* Lab Test - Create Sales Invoice bug fixed
* Healthcare menu rearranged
* Healthcare Settings - Optimised and Rearragnged
* Healthcare Settings - Expense account removed
* Receivable account removed from patient
* Patient - Optimised and Rearragnged
* Removed Referring Physician
* Healthcare Settings - bold headings removed
* Physician - Patient - Fields are Segregated
* Remove Service Unit
* Remove - Service Type
* Consultation invoice
* Lab Test - invoice
* Patient - Invoice
* Rename Appointment to Patient Appointment
* wip
* Patient Dashboard, Physician Form cleanup
* Dosage renamed to Prescription Dosage
* Renamed Drug Prescription Duration to Prescription Duration
* Patient Appointment booking modal
* Patient Age - calculate by dob
* Remove - scheduler
* Consultation - Appointment to Patient Appointment
* Patient Dashboard - rearranged
* Patient Appointment
* Removed rer_physician from lab test and consultation
* Patient Appontment Changes
* Appointment and Consultation - optimized
* Patient Appointment - fee validity code optimized
* Consultation and Patient Appointment - Invoice validate two side
* fix : #13 remove relation to admission
* Healthcare - Patient Portal
* fix import error
* domain Healthcare added on install
* Removed - Invoice Test Report
* Physician Schedule - menu
* Consultation - patient details - re write
* New Doctype-Medical Code
* Consultation - Daignosis codification
* Medical Code - Codification - Settings
* Medical Code Standard - Medical Code - Codification - Settings
* fix appointment calendar
* fix appointment analytics
* Menu Medical Code Standard
* New Doctype - Medical Code Standard
* Set Physician Role insted of IP Physician and OP Physician Role
* fixed some json files
* Medical code - permission to physician
* Unused Childs - Work Schedule and User List - Removed
* Label Procedure to Lab Test
* Lab Test and Patient - code optimised
* Add Item Groups - setup wizard
* Healthcare Settings - add Role - Medical Administrator
* Healthcare - Demo setup - Make Demo
* Fee Validity - Logic Test
* Test Fee Validity - Optimised
* Healthcare Doctypes - Restricted to Domain Healthcare
* Domainify - remove Healthcare Roles - Other Domains
* Healthcare doctypes - beta checked
* Codacy fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Lab Test - print hide =1 for some fields
* Consultation - Codification field label to Medical Coding
* Codacy fixes - import frappe and etc.
* Codacy fixes - import frappe in test_vital_signs
* Codacy fixes
* Codacy fixes
* Codacy fixes and remove delete perm for patient
* send_sms - import form frappe
* Healthcare Settings
* Lab Prescription - Consultation - Test Code - read_only = 0
* Portal fixes
* Patient Appointment - filter physician - if has schedule
* Physician - IP Charge - Removed
* test - files
* Web Form - Patient Profile - removed
* Role Medical Administrator to Healthcare Administrator
* WIP healthcare documentation
* Coday - fixes
* Travis - fixes
* Lab Test Report - menu
* Reorder Healthcare settings - group lab config to bottom
* Sample Collection - New - allow Sample and patient Selection
* Rate - similar behaviour and Label as in Item Standard Selling Rate
* Healthcare documentation
* Lab Test Samples to Lab Test sample
* Commplaints to Complaint
* Commplaints to Complaint
* Antibiotics to Antibiotic
* Appointment Token Number - remove
* View - Medical record
* Codacy fixes
* update healthcare docs
* Cleanup Docs - Search, quick entry, trsck change, etc.
* [minor] ux changes
2017-09-13 12:52:30 +05:30
tunde
1255aa0f11
Merge branch 'develop' into payment-terms
2017-09-12 11:54:52 +01:00
Nabin Hait
de9eebe51c
Fixed multiple ui tests
2017-09-12 15:40:33 +05:30
tunde
df3a175974
fix bugs: add payment_schedule
if payment_terms_schedule
specified
2017-09-11 11:02:57 +01:00
mbauskar
dfeadf876e
Merge branch 'master' into develop
2017-09-10 12:32:21 +05:30
Makarand Bauskar
80b2ba2b9a
[hotfix] fixed Not Permitted issue for System user while accessing documents on portal ( #10725 )
...
* [hotfix] dont allow guest user to list the invoices or orders
* [hotfix] fixed Not Permitted issue for System user while accessing documents on portal
* [codecy] removed trailing whitespace
* [fixes] added filters for supplier in RFQ and other minor fixes
2017-09-10 12:04:28 +05:30
rohitwaghchaure
225ac0dac3
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-08 10:31:21 +01:00
tunde
24cb494a3b
Revert "Revert "make payment_schedule field no-copy""
...
This reverts commit fbd895d781
.
2017-09-08 10:07:39 +01:00
tunde
fbd895d781
Revert "make payment_schedule field no-copy"
...
This reverts commit 4f4148b0da
.
2017-09-08 10:06:46 +01:00
tunde
4f4148b0da
make payment_schedule field no-copy
2017-09-07 18:49:10 +01:00
tunde
9085a5e52d
more test cases for quotation, purchase/sales order
2017-09-07 14:31:33 +01:00
tunde
ad7d3a1733
Merge branch 'develop' into payment-terms
2017-09-07 13:13:59 +01:00
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
tunde
794001df50
more test cases in Supplier
2017-09-06 09:16:11 +01:00
tunde
98cca8ee18
remove unused imports
2017-09-06 06:11:58 +01:00
tunde
743ba690dd
more test cases for Supplier
2017-09-05 01:17:14 +01:00
tunde
635423d70f
rewrite Supplier test cases
2017-09-04 19:37:54 +01:00
tunde
975eff7310
remove redundant test case
2017-09-01 12:10:44 +01:00
tunde
cbd72f6113
adjust failing tests
2017-09-01 11:48:00 +01:00
tunde
e44ce5d88e
adjustment: removes credit_days_based on and credit_days fields
2017-08-31 16:11:42 +01:00
tunde
762c810fa2
add payment terms to supplier master
2017-08-31 11:52:49 +01:00
tunde
3dfbd957b7
add payment terms to supplier master
2017-08-31 09:42:01 +01:00
AravindPranera
764bb30d2d
Fetching Opportunity items into Request for Quotation
2017-08-24 18:34:45 +05:30
tunde
d13fe18d30
Merge branch 'develop' into payment-terms
2017-08-22 14:18:11 +01:00
Doridel Cahanap
a6a93cbe06
[Fix] Request for Quotation Portal Title ( #10489 )
2017-08-22 18:39:38 +05:30
Vishal Dhayagude
a1637d8343
[UI Test] UI test for Sales Invoice with Payment Entry ( #10483 )
...
* [UI Test] UI test for Sales Invoice with Payment Entry
* Update test_purchase_order_receipt.js
2017-08-22 18:33:17 +05:30
Utkarsh Goswami
5cf3bdd593
Travis fix for purchase order receipt ( #10498 )
2017-08-22 17:39:06 +05:30
tunde
10fc880b06
Merge branch 'develop' into payment-terms
2017-08-21 18:27:46 +01:00
Zarrar
196b491ac4
[ui test ] Travis failing fix ( #10468 )
...
* Value in assertion was wrong
* Update test_purchase_order_receipt.js
2017-08-21 08:07:42 +05:30
tunde
c7f46218d7
tests and test fixes
...
fixes test case:
make sales invoice using customer that does not have credit_days_based_on 'Last Day Of Next Month'
so that it doesn't conflict with payment term due date
fix test case:
create purchase invoice with new supplier with credit_days_based_on
"Fixed Days" as the default "Last Day of Month" does not apply when
using payment terms
2017-08-20 17:23:27 +01:00
tunde
b76ab49ede
add Payment Term to Purchase Order
2017-08-20 16:52:05 +01:00
KanchanChauhan
dd351c585a
[Minor] Title added to rfq web view ( #10454 )
2017-08-20 11:00:43 +05:30
Vishal Dhayagude
8fd5b325e0
[UI Test] travis.yml modified for fresh UI Test ( #10446 )
...
* [UI Test] travis.yml modified for fresh UI Test
* [fix] travis
* Update test_production_order.js
* Update test_production_order.js
* Update test_purchase_order_receipt.js
* Update tests.txt
* Update test_purchase_order_receipt.js
2017-08-20 10:59:48 +05:30
Ben Cornwell-Mott
ee9f9863ff
MORE CODACY
2017-08-17 11:29:11 +05:30
Ben Cornwell-Mott
9727a3fe50
More codacy issues
2017-08-17 11:27:31 +05:30
Ben Cornwell-Mott
13218f7d76
Fixed codacy issues
2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott
bea7d9f919
Added tests
2017-08-17 11:25:12 +05:30
Ben Cornwell-Mott
1b43515160
Codacy fixes
2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott
48058a88e5
Minor cleanup
2017-08-17 11:18:49 +05:30
Ben Cornwell-Mott
f7e42211b9
Added Quote Status to RFQ Suppliers with No Quote
2017-08-17 11:18:49 +05:30
Shreya Shah
b5ed6823d6
[UI Test] Buying - Create Purchase receipt ( #10421 )
...
* Create purchase receipt after submitting the purchase order
* Checks quantity and rate in stock ledger
2017-08-17 11:03:43 +05:30
Vishal Dhayagude
f37eacdee5
[UI Test] Purchase Invoice ( #10422 )
...
* [UI Test] Purchase Invoice
* [fix] Travis failed
2017-08-17 11:01:59 +05:30
Shreya Shah
289400d944
[UI Test] Buying module - Multiple tests for Purchase orders ( #10414 )
...
* Extended timeout to avoid rare failures
* Get purchase orders with discount on grand total
* Get purchase orders with discount on individual items
* Get purchase orders and calculate taxes
* Added paths
2017-08-16 11:31:34 +05:30
Shreya Shah
f6544e95d4
[UI Tests] Buying Module - Supplier quotations and Purchase orders ( #10397 )
...
* Get Supplier Quotation with item wise discount
* Get purchase orders
* Added paths
* Codacy fix
2017-08-14 17:29:09 +05:30
Shreya Shah
67e2ef30c4
[UI test] Buying module - Get Supplier Quotations ( #10375 )
...
* Get quotations for Suppliers
* Calculate taxes and charges for Supplier quotations
* Added paths for tests
* Codacy fix
* Improvised the page route function
2017-08-14 09:17:00 +05:30
Shreya Shah
9e30969243
Fetching items from material requests doctype ( #10363 )
2017-08-11 12:02:35 +05:30
Shreya Shah
5ae39ae79a
Get Quotation requests and send emails to suppliers ( #10356 )
2017-08-10 16:20:47 +05:30
Shreya Shah
243f091b30
Get supplier details ( #10352 )
2017-08-10 10:51:47 +05:30
tunde
4a263c714d
get_party_detail should use default currency of party
2017-08-02 22:26:39 +01:00
rohitwaghchaure
49a6b4a4fa
[Fix] RFQ list showing to all supplier in the portal ( #10023 )
2017-07-25 14:12:58 +05:30
bcornwellmott
05e51d6c83
Add Get Suppliers dialog ( #10025 )
...
* Add Get Suppliers dialog
* Commonize code, use depends_on
* Update request_for_quotation.js
2017-07-25 14:10:23 +05:30
bcornwellmott
d023d9a0bd
Add RFQ email sent check ( #10068 )
...
* Add RFQ email sent check
* remove blankspace
* Removed debugger
2017-07-25 11:03:12 +05:30
bcornwellmott
96381da547
Supplier Scorecard ( #9294 )
...
* Initial start of scorecard docs
* Got basic functionality working
* Fixed doc names and added key functions
* Basic functional version minus Actions
* Hide scorecard docs until functional
* Created supplier scorecard documentation
* Added default variables and standings. Added restrictions for PO + RFQ
* Automatic daily scorecard creation + on save
* Added warning for PO nd RFQs
* Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo
* Added tests, fixed codacy formatting, small improvements
* Fixed test bug w/ criteria. Codacy cleanup
* Fixed codacy issues. Fixed sticky criteria
* Fixed bug with period search. Remove blank variable child.
* Updated docs, automatically add criteria and standings, clean up period create message
* Uncommented test, set docs to beta
* Fix for nabinhait review
* Fix codacy issue. Fix dict assignment for records
2017-07-24 22:42:30 +05:30
Nabin Hait
9c42161061
Itemised tax breakup fix in docs other than invoice ( #9961 )
...
* Itemised tax breakup fix in docs other than invoice
* Set itemised tax breakup and hsn code in existing docs
2017-07-20 13:32:01 +05:30
Nabin Hait
e06526ffff
Add indexes in some transaction doctypes ( #9889 )
2017-07-17 13:28:27 +05:30
Nabin Hait
fb8e59234b
Merge pull request #9652 from bcornwellmott/sq_lead_time
...
Added lead time field to supplier quotation
2017-07-11 23:39:27 +05:30
Ben Cornwell-Mott
b1f0fd4ac3
Lead time matches Item master
2017-07-10 09:09:29 -07:00
Nabin Hait
fa351f4bdf
Merge pull request #9433 from tundebabzy/issue-9424
...
Errors due to a single quote in Supplier's name #9424
2017-07-06 15:22:16 +05:30
Ben Cornwell-Mott
19d9381197
Added lead time field to supplier quotation
2017-07-05 13:17:13 -07:00
Makarand Bauskar
4095915bff
Merge pull request #9489 from rohitwaghchaure/billed_amt_issue_in_pr
...
[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before
2017-06-30 16:02:31 +05:30
Vishal Dhayagude
76f93d05b7
display image in supplier's list view ( #9500 )
...
* [fix]display supplier image in desk
* Supplier image displayed in desk
* Show image in supplier desk page
* [minor] removed whitespaces
2017-06-29 11:23:13 +05:30
Makarand Bauskar
eef3f62ff7
Merge pull request #9488 from rmehta/gst-reminder
...
[regional] ability to send gst reminders to all parties
2017-06-27 19:33:05 +05:30
Rohit Waghchaure
eb7eb43dfc
[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before
2017-06-27 17:34:44 +05:30
Rushabh Mehta
00ae424cac
[regional] ability to send gst reminders to all parties
2017-06-27 17:31:41 +05:30
Rohit Waghchaure
f3e91e2b2b
[minor] Currency label not displaying in the total advance field
2017-06-27 15:51:35 +05:30
tunde
5824ae98d9
calls local
to build frappe.form_dict
in order to pass failing test
2017-06-26 12:42:11 +01:00
tunde
8859eb23a3
set form_dict correctly
2017-06-26 12:01:41 +01:00
tunde
ea7768d3f3
fixes form_dict failure in travis test
2017-06-26 10:17:53 +01:00
tunde
bce13cd0e3
fixes failing test
2017-06-26 08:43:25 +01:00
tunde
94500fd17b
adds test case
2017-06-22 17:34:54 +01:00
Sagar Vora
5f407907a2
fix logic of quantity validation ( #9311 )
2017-06-16 11:43:36 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
_JG_
aafe0c517f
Update purchase_order_dashboard.py ( #9149 )
...
There are no links to projects
2017-06-13 13:00:47 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
2d79a641c2
Annual billing amount in party dashboard based on grand total
2017-05-24 16:46:56 +05:30
Ayush Shukla
76d965f340
[minor]-Changed receivable to payable ( #8880 )
2017-05-17 19:18:47 +05:30
Prateeksha Singh
edeb4dc7e0
Multiselect dialog for getting items ( #8583 )
...
* Concatenate docnames and send to mapper
* Multiselect with checkboxes
* set setters as separate filters
* Map filter fields to target_doc
* Get items from quotation (in SO) working
* [major] Set dialog setters for all forms
* Add date field
* Specify non-default date_fields
* [minor] add test_mapper.py
* [minor] remove cur_frm
* [minor][fix] test
* [minor] fix test with make_test_records
2017-05-15 11:32:06 +05:30
Nabin Hait
3257aeeb55
Price list rate fix multiple uom and validation with prev doc ( #8718 )
2017-05-06 12:47:14 +05:30
Nabin Hait
7228e1af6e
Customer/Supplier Name in sales/purchase analytics ( #8717 )
2017-05-06 12:45:37 +05:30
Pawan Mehta
cac94b9bd5
[fix] #8373 ( #8707 )
2017-05-05 17:29:57 +05:30
Makarand Bauskar
c4ec937835
[hotfix] fixed object has no attribute 'delivered_by_supplier' ( #8699 )
2017-05-05 11:52:17 +05:30
mbauskar
c482aeda1a
[fixes] added missing get_linked_material_requests method to buying utils
2017-05-02 14:05:54 +05:30
Nabin Hait
db8f41ba55
Added Payment documents as Quick Links in SO/PO
2017-04-26 14:34:41 +05:30
Nabin Hait
9b20e07431
[fix] currency field precision
2017-04-25 14:09:29 +05:30
Nabin Hait
2de3bf7a0f
Fixed indexes on sales and purchase transactions
2017-04-19 20:58:09 +05:30
mbauskar
1b32d913a2
[minor] fetch supplier address, address_display on supplier trigger
2017-04-13 11:55:20 +05:30
Rushabh Mehta
4b0381c820
[fix] tests
2017-03-31 17:36:48 +05:30
Rushabh Mehta
f0b4562a95
[refactor] move purchase_common.js -> public/js/controllers/buying.js
2017-03-31 17:36:48 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Nabin Hait
8bf58367b8
Fixed merge conflict
2017-03-27 12:30:01 +05:30
Rohit Waghchaure
414c0ab3bb
[fix] Quantity is not copying in the Received Qty during making of debit note
2017-03-17 17:19:17 +05:30
Kanchan Chauhan
6f7457a1b0
[Fix] Warehouse not required for Dropship
2017-03-16 16:03:41 +05:30
Rushabh Mehta
6d4a52562b
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rushabh Mehta
6b53792aea
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rohit Waghchaure
11fa7a9311
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
2017-03-14 13:26:10 +05:30
Saurabh
4f4d0a8369
[fix] validate negative quantity while creating purchase receipt
2017-03-13 15:37:47 +05:30
Nabin Hait
52daaca885
Fixed merge conflict
2017-03-08 14:30:38 +05:30
Rohit Waghchaure
d05a8737f9
[Fix] Purchase return issue
2017-03-08 10:30:23 +05:30
Nabin Hait
b3ffd6b282
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
...
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +05:30
Nabin Hait
6bbf141d57
Merge branch 'develop' into link_mrs
2017-02-28 15:55:35 +05:30
Nabin Hait
38c7ad2c69
Update supplier_quotation.json
2017-02-28 15:53:10 +05:30
Nabin Hait
491d2ad140
Update request_for_quotation.json
2017-02-28 15:52:43 +05:30
Nabin Hait
365ed5dea9
Update purchase_order.json
2017-02-28 15:51:00 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
robert schouten
4766562ff0
fix typo on get product bundle
2017-02-27 13:30:18 +08:00
Ben Cornwell-Mott
08c1e86b1c
Moved link button. Creates new row for unlinked quantities
2017-02-25 23:16:54 -08:00
Rushabh Mehta
509543752c
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-23 17:03:46 +05:30
mbauskar
d6e409ea92
[minor] hide recurring section if document is in __local state
2017-02-22 18:22:14 +05:30
Kanchan Chauhan
f2803ac427
[Fix] Throw error if item is added multiple time
2017-02-22 10:40:38 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
Rushabh Mehta
e6aa3b435a
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-09 17:47:22 +05:30
Ben Cornwell-Mott
28945438f2
Created button to link buying items to material requests
2017-02-05 18:55:57 -08:00
Rushabh Mehta
587dd90182
[minor] removed customer status
2017-02-01 12:01:24 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
mbauskar
83f4780f74
[Fixes] Address and Contact fixes
2017-01-30 10:45:28 +05:30
mbauskar
8271b4c564
[minor] fixes in address filters
2017-01-30 10:45:28 +05:30
mbauskar
cbc49e2989
[WIP] Address and Contact Fixes
2017-01-30 10:45:28 +05:30
Nabin Hait
9e294ee454
Merge branch 'rfq_supplier_pull' into develop
2017-01-17 12:26:09 +05:30
Nabin Hait
2ad62c2892
In RFQ, get items from material requests based on possible supplier
2017-01-17 12:25:33 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Ben Cornwell-Mott
1cd7e54822
Adds button to find MRs linked to Supplier
2017-01-11 03:05:49 -08:00
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
a9b9edd9bc
Merge pull request #7392 from frappe/bcornwellmott-patch-2
...
Fix number of digits on report
2017-01-09 15:48:04 +05:30
bcornwellmott
34e34ed1e8
Trigger Restart of build checks
2017-01-06 17:21:16 -08:00
Nabin Hait
91621639e8
Reload in_standard_filter property
2017-01-06 12:54:16 +05:30
bcornwellmott
a3e7c38734
Fix number of digits on report
...
Currently the cells can show many digits.
2017-01-05 09:44:18 -08:00
Nabin Hait
59a67c3586
Update supplier_quotation.py
2017-01-05 14:58:30 +05:30
bhupen
107099aac9
you can make quotation from supplier quotation
2017-01-04 17:04:12 +05:30
Nabin Hait
8281b36a26
Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress
...
Email ID renamed to Email Address
2017-01-04 15:46:48 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Rushabh Mehta
985cb8226d
[minor] dont get warehouse in opening entry #7353
2016-12-30 15:06:54 +05:30
Rushabh Mehta
e60c2c7b7a
[minor] dashboard cleanups
2016-12-27 12:14:37 +05:30
Nabin Hait
58667ab123
Fixed merge conflict
2016-12-09 15:49:24 +05:30
Nabin Hait
76a8508d2b
Unlink Quality Inspection from PR while cancelling QI
2016-12-09 15:09:11 +05:30
Nabin Hait
8e885163a3
Update quoted_item_comparison.py
2016-12-09 12:17:45 +05:30
Nabin Hait
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Kanchan Chauhan
5c031a3512
[Fix] Quoted Item Comparison
2016-12-08 17:29:04 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Nabin Hait
c2f8dd71d7
Merge pull request #6965 from manassolanki/qa_redesign
...
[Fix] [Enhancement] Quality Inspection
2016-11-21 14:49:18 +05:30
KanchanChauhan
49a50fef63
Group same item in SO print ( #6959 )
2016-11-18 13:57:53 +05:30
Manas Solanki
34feab1b25
[Fix] Redesign of quality inspection doctype
2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5
Quality Inspection Issue
...
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
2016-11-16 17:22:38 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
rohitwaghchaure
7be942db54
[Fix] Status updater for sales order in purchase order ( #6944 )
2016-11-16 11:14:32 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
Nabin Hait
81f7a265bc
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
...
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
bcornwellmott
3af67fb2c3
Fix syntax
2016-10-31 08:53:37 -07:00
bcornwellmott
8d083f0d10
[fix] Change communication to Linked
...
Currently, the Request for Quotation emails are not linked to the RFQ document. This resolves that issue.
https://discuss.erpnext.com/t/open-communications-for-rfq/17184
2016-10-31 06:54:01 -07:00
Shreyas Patil
6c7d6e095b
Update purchase_order_item.json
2016-10-26 12:47:35 +05:30
shreyas
fd04d62c2e
[Minor] Added expected_delivery_date to purchase order item doctype
2016-10-26 12:38:31 +05:30
shreyas
99e063f831
[Fix] Make purchase order item reqd_date modifiable after submit
2016-10-25 12:44:27 +05:30
Kanchan Chauhan
cce16b29b0
Group similar items in PO
2016-10-20 14:31:34 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Nabin Hait
f32547a414
Merge pull request #6637 from nabinhait/cost_center_fix
...
Set cost center while creating invoice from SO/PO
2016-10-18 15:18:16 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Nabin Hait
55a8797919
Set cost center while creating invoice from SO/PO
2016-10-18 14:54:17 +05:30