brotherton-erpnext

Author	SHA1	Message	Date
Ganga Manoj	842ceb1301	fix: cannot reconcile bank transactions against internal transfer payment entries (#26932 ) * fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled * fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction * fix: indentation and args Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-25 20:32:26 +05:30
Frappe PR Bot	255b99ebdc	feat: Employee reminders (#25735 ) (#27115 ) * feat: Add reminders section to HR Settings * refactor: Extract generic function for getting Employees * feat: Employee Work Anniversary Reminder * feat: Daily Holiday Reminder * fix: Unnecessary params and replace [] with .get() * test: Daily Holiday Reminders * test: is_holiday basic tests * refactor: Move employee reminders code to separate module * feat: Add advance reminder to HR settings * feat: Advance Holiday Reminders * refactor: get_holidays_for_employee * feat: Email holiday reminders in advance + tests * fix: Remove unused import * refactor: HR Setting Reminder Section * refactor: Remove Daily Holiday Reminders feat * feat: Reminder miss warning * fix: Failing test and function name change * chore: Add patch for field rename * chore: Rename frequency label * fix: Failing patch test * fix: sider and removed description of fields * fix: email alignment Co-authored-by: pateljannat <pateljannat2308@gmail.com> Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com> (cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac) Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com> Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>	2021-08-24 20:19:22 +05:30
Saqib	c335962827	refactor!: drop e-invoicing integration from erpnext (#26940 )	2021-08-20 11:10:46 +05:30
Ankush Menat	4551d7d602	chore: mass trailing whitespace and EOF fixes	2021-08-19 13:43:28 +05:30
Marica	112fc888f1	fix: Return Qty in PR/DN for legacy data (#27001 )	2021-08-18 15:29:48 +05:30
Ankush Menat	8bbec42fa0	fix: undo changes to patch (#26983 ) * fix: undo changes to patch * ci: ignore empty body / head	2021-08-17 15:14:13 +05:30
Rohit Waghchaure	eb1e3181a4	fix: conflicts while merging brnach version-13 to develop	2021-08-17 10:53:19 +05:30
Deepesh Garg	4b9c127494	Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre	2021-08-16 14:38:54 +05:30
Deepesh Garg	b58b1127f3	fix: Add mandatory depends on condition for export type field	2021-08-16 14:36:50 +05:30
Deepesh Garg	3f07bb7021	fix: Add mandatory depends on condition for export type field	2021-08-16 13:18:39 +05:30
Frappe PR Bot	a7e0805039	fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26879 )	2021-08-10 17:16:15 +05:30
Saqib	84c4161c00	fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26638 )	2021-08-10 16:46:44 +05:30
Frappe PR Bot	18bd182f61	patch: delete all orphaned tables docs (#26863 )	2021-08-09 18:34:51 +05:30
Anuja Pawar	08ae49cd11	fix(regional): add permissions for VAT Audit report (#26851 ) fix(regional): add permissions for VAT Audit report	2021-08-09 17:58:52 +05:30
Ganga Manoj	458f7f1194	patch: delete all orphaned tables docs (#26743 )	2021-08-09 17:16:48 +05:30
Frappe PR Bot	1b9a5c851d	fix: incorrect amount in work order required items table. (#26585 ) (#26623 ) * fix: amount in work order not equal to rate * qty * fix: patch for amount in work order required items (cherry picked from commit `cd12d95a24`) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-03 20:06:36 +05:30
Deepesh Garg	346bde875c	Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report	2021-08-03 14:44:20 +05:30
Frappe PR Bot	5a442f1bce	fix: change format string to percent string interpolation (#26774 ) (#26778 ) (cherry picked from commit `7fe588e236`) Co-authored-by: Alan <2.alan.tom@gmail.com>	2021-08-03 13:29:10 +05:30
Anuja	f2ee1155c0	fix: sider fixes	2021-08-02 23:13:21 +05:30
Ankush	efb037b566	refactor!: drop shopify integration from ERPNext (#26700 ) BREAKING CHANGE: remove Shopify integration. The integration is moved to a separate app with additional enhancements. The app is still FOSS and licensed under the same license as ERPNext. Any data migration required is taken care of after installing the app and enabling it. New app: https://github.com/frappe/ecommerce_integrations	2021-08-02 21:57:52 +05:30
Alan	7fe588e236	fix: change format string to percent string interpolation (#26774 )	2021-08-02 20:07:55 +05:30
Ankush	e43bdf76a5	chore: warning for shopify integration deprecation (#26701 ) * chore: warning for shopify integration deprecation * fix: warn deprecation during patch for sysadmins	2021-08-02 18:57:48 +05:30
Anuja	3bcbc86291	fix: resolved conflicts in patches.txt	2021-08-02 12:58:46 +05:30
Anuja	f9fc3bbfa8	fix: added patch for custom field and minor fixes	2021-08-02 12:54:30 +05:30
Rohit Waghchaure	343143037c	fix: conflicts	2021-08-01 14:45:24 +05:30
Anupam Kumar	89f2138fbc	Merge branch 'version-13-hotfix' into email-digest	2021-07-28 18:24:29 +05:30
Deepesh Garg	6ac68f3bc7	fix: Patch	2021-07-28 17:19:00 +05:30
Deepesh Garg	8c7d9efa9d	fix: Chnage fieldtype from data to check	2021-07-28 17:18:50 +05:30
Deepesh Garg	fa8e6ac7cd	fix: Patch	2021-07-28 15:30:05 +05:30
Deepesh Garg	9350249941	fix: Chnage fieldtype from data to check	2021-07-28 12:57:59 +05:30
Frappe PR Bot	3a39c0f19a	fix: force reload of Opportunity in patch (#26668 ) (#26681 ) (cherry picked from commit `ac2e139d5b`) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2021-07-28 00:19:32 +05:30
Raffael Meyer	ac2e139d5b	fix: force reload of Opportunity in patch (#26668 )	2021-07-28 00:14:59 +05:30
Frappe PR Bot	b122a1eaa0	fix: reload manufacturing setting before patch (#26641 ) (#26670 ) (cherry picked from commit `c8d7a8c781`) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-07-27 16:59:06 +05:30
Ankush	7a97b6d6a8	fix: reload manufacturing setting before patch (#26641 ) (cherry picked from commit `c8d7a8c781`)	2021-07-27 11:19:33 +00:00
Ankush	c8d7a8c781	fix: reload manufacturing setting before patch (#26641 )	2021-07-27 16:39:38 +05:30
Deepesh Garg	a661667e2a	fix(India): Default value for export type	2021-07-26 18:46:14 +05:30
Ankush	cd12d95a24	fix: incorrect amount in work order required items table. (#26585 ) * fix: amount in work order not equal to rate * qty * fix: patch for amount in work order required items	2021-07-25 13:10:50 +05:30
Deepesh Garg	328444b530	fix(India): Default value for export type	2021-07-23 20:28:02 +05:30
Rucha Mahabal	57514f7b1d	feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427 ) (#26564 ) * feat: Update Subscription Activated field to Subscription Status to accomodate Halted status * feat: API Endpoint to halt Razorpay subscription * fix: sider * fix: validation message * test: halted razorpay subscription	2021-07-21 00:46:34 +05:30
Rucha Mahabal	a758071532	feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427 ) * feat: Update Subscription Activated field to Subscription Status to accomodate Halted status * feat: API Endpoint to halt Razorpay subscription * fix: sider * fix: validation message * test: halted razorpay subscription	2021-07-21 00:24:09 +05:30
Rohit Waghchaure	56e4a88956	fix: added patch to fix missing FG item	2021-07-16 15:06:57 +05:30
Rohit Waghchaure	13e9aa5956	fix: added patch to fix missing FG item	2021-07-16 14:34:24 +05:30
Rohit Waghchaure	a748dd9261	feat: provision to make subcontracted purchase order from the production plan	2021-07-15 19:01:36 +05:30
Saqib	0683337f14	fix: incorrect response by variance & resolution by variance (#26173 )	2021-07-12 20:21:07 +05:30
Nabin Hait	fa006402b8	fix: merge conflict	2021-07-01 12:47:28 +05:30
Rohit Waghchaure	61690775a8	feat: provision to make subcontracted purchase order from the production plan	2021-06-29 19:59:20 +05:30
Rohit Waghchaure	c878389050	fix: or condition filter in the get_all	2021-06-24 18:14:18 +05:30
Afshan	7fd44907ba	feat: fetching of qty as per received qty from PR to PI (#26184 )	2021-06-24 14:26:36 +05:30
Afshan	53fefd7513	feat: fetching of qty as per received qty from PR to PI (#25837 )	2021-06-24 10:09:02 +05:30
Nabin Hait	0950481253	fix: merge conflict	2021-06-15 20:18:06 +05:30
Saqib	80077d215f	fix: patch for adding doctype to sla (#26053 )	2021-06-14 19:34:25 +05:30
Himanshu	ec25d5938b	feat(SLA): Apply SLA to any document (#22449 )	2021-06-14 19:05:52 +05:30
Gavin D'souza	137d08a9d7	fix: Manually link_fields from flags before rename_doc	2021-06-10 15:09:17 +05:30
Gavin D'souza	96f8ebc308	fix(patch): Handle NULL values from fieldtype change	2021-06-10 15:08:55 +05:30
Gavin D'souza	aedf25ba46	chore: Drop old patches v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer	2021-06-10 15:07:39 +05:30
Gavin D'souza	102afe7de1	fix: Manually link_fields from flags before rename_doc	2021-06-04 20:11:34 +05:30
Gavin D'souza	ac99c719bc	Revert "fix(patch): Reload linked doctypes before renaming dt" This reverts commit `4e2e8daca9` because although it fixed it locally, didn't seem to do anything for erpnext CI	2021-06-04 20:10:26 +05:30
Gavin D'souza	4e2e8daca9	fix(patch): Reload linked doctypes before renaming dt	2021-06-04 17:56:28 +05:30
Gavin D'souza	0b7da52ef1	fix(patch): Handle NULL values from fieldtype change	2021-06-04 17:07:45 +05:30
Gavin D'souza	5bf5775b43	chore: Drop old patches v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer	2021-06-04 11:49:56 +05:30
Ankush Menat	2c7fac0e76	fix: reload doc for possible future schema changes (#25904 )	2021-06-01 11:56:00 +05:30
Anuja P	e2059fb9f6	fix: spaces to tabs	2021-05-26 20:07:53 +05:30
Anuja P	5e4128e70c	fix: patch for existing issues	2021-05-26 20:03:14 +05:30
Anurag Mishra	5670cf4386	feat: enhancements in Training Event (#25782 ) * feat: Some Minor fixes * fix: patch file * fix: patch Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-05-24 20:24:20 +05:30
Rucha Mahabal	0d8b9a9d0a	fix(patch): billable field not renamed	2021-05-20 19:53:30 +05:30
Anupam	1270febfff	fix: sider issues	2021-05-20 14:15:58 +05:30
Anupam	aeb88385bb	patch: timesheet changes	2021-05-20 14:11:36 +05:30
Anupam	35137ba9e0	removing currency filter and added rate conversion while fetching timesheets in SI	2021-05-16 14:17:56 +05:30
Anupam	cab998c293	adding patch	2021-05-15 20:40:20 +05:30
Anupam	fd4743cc31	refactor: timesheet	2021-05-15 20:01:17 +05:30
Deepesh Garg	55fe85d850	feat(India): Multiple GST enhancement and fixes (#25249 ) * fix: RCM tax calculation * feat(India): ITC Reversal via Journal Entry * fix: Reverse Charge booking logic and validation * fix: Addd patch for availed ITC fields * fix: Hooks method to update availed ITC field * fix: Cleanup and fixes in GSTR3B report * fix: Update params in GSTR-1 report * fix: Debit note using Sales Invoice * fix: Setup and patch * fix: GSTR 3B report cleanup and updates * fix: Add method to get invoices liable to reverse charge * fix: Add taxable value in Purchase Invoice Item * fix: Inward supplies liable to reverse charge * fix: Linting issues * fix: GSTR3B report test	2021-05-14 12:17:41 +05:30
Shadrak Gurupnor	f648d2d7c4	fix: added tax_types list (#25587 )	2021-05-07 12:15:19 +05:30
Saqib	900a8fb21a	feat(pos): ability to retry on pos closing failure (#25595 ) * feat(pos): ability to retry on pos closing failure * fix: sider issues * fix: sider issues * fix: mark all queued closing entry as failed * feat: add headline message	2021-05-06 17:02:47 +05:30
Saqib	d502f76319	feat(e-invoicing): e-way bill validity field (#25555 )	2021-05-06 16:10:55 +05:30
barredterra	24e2cc9107	Merge branch 'develop' into datev_fixes	2021-05-03 18:19:28 +02:00
Rohit Waghchaure	2fb573781d	fix: rename field has not updated value of deposit and withdrawal fields	2021-05-01 17:56:40 +05:30
Raffael Meyer	b2be91e731	Merge branch 'develop' into datev_fixes	2021-04-27 12:21:14 +02:00
Ankush Menat	9178d95cca	fix: can not create item variants (#25433 ) * fix: item_code assigned to function returning None * fix: ignore has_variants and attributes in variant * fix: patch to remove has_variants and attributes * chore: fix whitespace in translation	2021-04-26 15:37:17 +05:30
Anoop	c21ce42559	fix(patch): lab module patch fix (#25447 ) * fix(patch): lab module patch fix * fix: param Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-22 22:44:44 +05:30
Rucha Mahabal	e3b8057eb4	fix: Laboratory Module patch (#25431 )	2021-04-22 16:11:17 +05:30
Ankush Menat	e972ceb798	fix: patch for updating shipment status	2021-04-18 13:22:19 +05:30
Ankush Menat	d6be154ac2	fix: implicit string concatenation (#25371 ) * fix: implicit string concatenations * chore: rerun healthcare patch for company fields	2021-04-16 22:08:44 +05:30
Raffael Meyer	6daae681bd	Merge branch 'develop' into datev_fixes	2021-04-16 12:37:14 +02:00
Nabin Hait	2535fe9b1e	fix: Resolved merge conflict	2021-04-14 13:09:50 +05:30
Rohit Waghchaure	a8f78fabfd	fix: patch failing while migrating from v7 to v13	2021-04-13 18:51:21 +05:30
Rohit Waghchaure	03635fb0c4	feat: ESS User	2021-04-13 18:51:21 +05:30
Saqib	dbb76a7d00	fix(e-invoicing): validations & tax calculation fixes (#25314 ) * fix: GST on freight charge in e-invoicing * feat(india): bulk e-invoice generation (#24969) * fix: cannot fetch e invoice settings * fix: patch condition (#25301) * fix: patch condition * fix: except einvoice loading error seperately * fix: json.loads error Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-04-13 18:49:03 +05:30
Nabin Hait	10c61376e3	fix: Backport missing commits to develop branch (#25305 )	2021-04-13 15:46:01 +05:30
Deepesh Garg	bb92929048	Merge pull request #25256 from nextchamp-saqib/italy-e-invoicing feat(italy): add document type field for e-invoicing	2021-04-13 13:48:21 +05:30
Saqib	a19c98255f	fix: patch condition (#25301 )	2021-04-12 19:02:28 +05:30
Saqib	9320316462	feat(india): bulk e-invoice generation (#24969 )	2021-04-12 17:55:46 +05:30
Deepesh Garg	c36e48a869	fix: GST on freight charge in e-invoicing (#25000 ) * fix: GST on freight charge in e-invocing * fix: Add patch for taxable value field * fix: Handle discounts on net total * fix: Handle all types of discounts for e-invoicing * fix: Absolute taxable values * fix: Use correct tax amount	2021-04-12 10:55:43 +05:30
Anoop	207166fe8b	fix(patch): copy Lab Test / Template renamed field values (#25276 ) reload_doc doctypes introduced since v11	2021-04-12 10:25:34 +05:30
Deepesh Garg	81ecd0b8b6	Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category	2021-04-10 20:54:38 +05:30
Rohit Waghchaure	1db8c51749	fix: changed logic	2021-04-10 10:45:29 +05:30
Rohit Waghchaure	1358443cdb	fix: patch	2021-04-10 10:42:08 +05:30
Anupam Kumar	986452107b	fix: Lead Source's module (#24583 ) * fix: Lead Source's module * fix: patch fix	2021-04-09 18:15:51 +05:30
Saqib Ansari	032246dc2b	feat(italy): add document type field for e-invoicing	2021-04-09 12:08:24 +05:30
barredterra	0a45fc8c58	fix: remove unused import	2021-04-08 18:25:17 +02:00
barredterra	c6e13ac218	fix: patch to fill Debtor/Creditor Number	2021-04-08 16:57:55 +02:00
barredterra	ed36fb2073	docs: doctring for patch	2021-04-08 16:57:20 +02:00
barredterra	03425071e7	fix: patch to add custom fields	2021-04-08 16:31:00 +02:00
Nabin Hait	aa809ceffe	fix: Patch fixes for v13 upgrade (#25220 )	2021-04-07 10:57:46 +05:30
Anupam	e711b30f66	fix: resolved conflicts	2021-04-05 17:06:59 +05:30
Anoop	b27441b40c	fix: failing patch - reload_doc new doctypes added in v13 (#25194 )	2021-04-05 10:41:28 +05:30
Saurabh	f9b9298a6d	fix: reload doc in patch (#25144 )	2021-04-01 21:59:35 +05:30
Nabin Hait	11eb30d082	fix: merge conflict	2021-04-01 15:03:11 +05:30
Ankush Menat	1bdf9c4161	fix: patch for purchase receipt status	2021-04-01 11:58:34 +05:30
Saqib	fb4051bddd	feat: discount configuration on early payments (#25089 ) * feat: discount configuration on early payments Co-authored-by: Nabin Hait <nabinhait@gmail.com> * fix: remove duplicate patch call Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:52:51 +05:30
Saqib	0586b7db79	feat: discount configuration on early payments (#24586 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:03:53 +05:30
Deepesh Garg	f954ec7c78	fix: Add patch for GST category field in Delivery Note	2021-03-29 20:31:11 +05:30
rohitwaghchaure	b38ea0cc8b	fix: patch (#25014 ) * fix: patch * fix: pricing_rule test cases	2021-03-28 15:51:32 +05:30
Mohammad Hasnain Mohsin Rajan	52701dcbbc	fix: patch regional fields for old companies (#24988 )	2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan	f29c075bc3	fix: patch regional fields for old companies (#24999 ) * fix: patch regional fields for old companies * chore: fix sider	2021-03-25 12:56:13 +05:30
Syed Mujeer Hashmi	f114da2f67	refactor: Make Discharge Schedule Date as Datetime (#24940 ) * refactor: Make Discharge Schedule Date as Datetime Like Admitted Datetime make discharge date as discharge datetime. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: Add patch for renaming discharge_date to discharge_datetime Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: quote style Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-03-23 17:48:25 +05:30
Rushabh Mehta	6ef213e5c6	fix(minor): patch add_state_code_for_ladakh	2021-03-16 11:59:54 +05:30
Nabin Hait	6e3668dc30	fix: merge conflict	2021-03-11 16:14:27 +05:30
Rucha Mahabal	0b29f87fa2	feat(Non Profit): 80G Certificates and Donations (#24848 ) * feat(Non Profit): 80G Certificates and Donations * fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)	2021-03-11 16:02:23 +05:30
Rucha Mahabal	be2c1fca7b	feat(Non Profit): 80G Certificates and Donations (#24657 ) * feat: 80G Certificates * feat: add non-profit custom fields for India * feat: 80G Certificate print format for memberships * feat: Donation doctype and API endpoint to capture donations via razorpay * chore: Rename Membership Settings to Non Profit Settings * chore: clean up Non Profit Settings - Rename fields, better labels - patch for renaming * feat: Webhook secret generation for Razorpay donations in Non-Profit Settings * feat: Payment Entry for donations - added Donor as Party Type - setting for automating payment entries for donations created via web form * fix: linter and sider issues * fix: translation syntax * feat: PAN Details custom field for Indian donors * feat: 80G certificates for Donations with Print Format * fix: sider * feat: validations for donor and donation - create donor for website user from donations - validate donor email * feat: extract member name from subscription notes * test: Donation * test: Tax Exemption 80G Certificate * chore: styling fixes * fix: tests * fix: sider * feat: extract PAN number from additional subscription notes * feat: Add creation user field in Non Profit Settings fix: Payment Entry not generating for memberships and donations * feat: update desk page * fix: tests	2021-03-11 13:19:44 +05:30
Saurabh	202ef92fa1	Merge branch 'version-13-beta-pre-release' into version-13-beta	2021-03-05 09:34:01 +05:30
Saqib Ansari	49e4693abf	fix(patch): updating pos closing reference in merge log	2021-03-04 11:58:45 +05:30
Nabin Hait	d96be3f9f1	Reposting patch and earned leave rounding (#24783 ) * fix: rounding of earned leave is optional (#24782) * fix: reposting patch fixes (#24775)	2021-03-02 17:02:47 +05:30
Nabin Hait	bd10d7c028	fix: reposting patch fixes (#24775 )	2021-03-02 13:37:45 +05:30
Rohit Waghchaure	9f13a060f0	fix: reposting patch	2021-02-26 17:44:54 +05:30
Rohit Waghchaure	c603fd638b	fix: reposting patch	2021-02-26 17:42:52 +05:30
Rohit Waghchaure	39b5ad8e69	fix: patch failing because of incorrect gl entries	2021-02-23 18:35:36 +05:30
Rohit Waghchaure	bc8c9de26d	fix: patch failing because of incorrect gl entries	2021-02-23 18:26:48 +05:30
Nabin Hait	d46b23699c	fix: optimize reposting of gle and sle (#24702 ) * fix(india): escape for special characters in JSON (#24695) JSON does not accept special whitespace characters like tab, carriage return, line feed Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf Related issue: ISS-20-21-09811 * fix: Accounting Dimension creation background job timeout * fix(regional): vehicle no is mandatory for ewaybill generation (#24679) * fix: vehicle no required for e-invoice * fix: ewaybill generation dialog condition * fix: excluding unidentified accounts from gstr-1 * fix: optimize reposting of sle and gle (#24694) * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> * fix: Replaced spaces with tabs * fix: merge conflict * fix: test cases Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: pateljannat <pateljannat2308@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-23 16:38:52 +05:30
Nabin Hait	19f8fa59d3	fix: optimize reposting of sle and gle (#24694 ) * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-22 22:27:22 +05:30
Mohammad Hasnain Mohsin Rajan	07f40596bc	feat(Bank Reconciliation): Redesign (#24273 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-22 22:19:47 +05:30
Nabin Hait	69a6bed106	fix: Replaced spaces with tabs	2021-02-22 20:03:23 +05:30
Nabin Hait	0ca74ce04b	fix: Fixes related to client script renaming (#24698 )	2021-02-22 19:32:51 +05:30
Saqib	14472f6bab	fix(regional): vehicle no is mandatory for ewaybill generation (#24679 ) * fix: vehicle no required for e-invoice * fix: ewaybill generation dialog condition	2021-02-22 19:27:23 +05:30
Ankush Menat	3248da9089	fix(India): Add GST state code for Ladakh	2021-02-18 21:32:48 +05:30
Nabin Hait	deddcc513d	fix: stock and account balance syncing (#24644 ) * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: minor fix	2021-02-18 21:28:16 +05:30
Rohit Waghchaure	83f5468ca1	fix: patch	2021-02-18 21:28:03 +05:30
rohitwaghchaure	7797e9d3ac	fix: added patch to fix incorrect stock qty and account value (#24628 )	2021-02-18 21:27:01 +05:30
Saqib	90ff48baa3	refactor: POS Invoice merging and cancellation (#24351 ) * feat: pos invoice merging with background jobs * fix: invoice threshold for queueing job * refactor: cancellation flow of point of sale * feat: tests for cancellation of pos closing Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-02-18 21:00:34 +05:30
Marica	052a2767f0	Merge branch 'develop' into email-digest	2021-02-17 11:21:14 +05:30
Nabin Hait	9b178bcd10	fix: stock and account balance syncing (#24644 ) * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: minor fix	2021-02-16 14:57:00 +05:30
Rohit Waghchaure	9a40c1b2e1	fix: patch	2021-02-16 10:35:10 +05:30
rohitwaghchaure	d60ff83b6f	fix: added patch to fix incorrect stock qty and account value (#24628 )	2021-02-16 09:12:27 +05:30
Ankush Menat	57c3d373a7	fix(India): Add GST state code for Ladakh	2021-02-15 15:03:50 +05:30
Saurabh	df589594cd	Merge branch 'version-13-beta-pre-release' into version-13-beta	2021-02-02 20:58:26 +05:30
Suraj Shetty	54a253616a	Merge pull request #24508 from frappe/rebrand-ui	2021-02-02 09:07:35 +05:30
Suraj Shetty	852e67c5ee	fix(patch): Use db_set to ignore validation	2021-02-01 22:40:40 +05:30
Marica	2fa840e5d4	chore: Use sql to set naming series in older projects (#24513 ) * chore: Use sql to set naming series in older projects * fix: Remove unncessary db.commit()	2021-02-01 20:07:00 +05:30
Marica	fb016edb7a	chore: Use sql to set naming series in older projects (#24512 ) * chore: Use sql to set naming series in older projects * fix: Remove unncessary db.commit()	2021-02-01 20:05:29 +05:30
Saqib Ansari	cee3670167	chore: clean up sales invoice form	2021-02-01 15:45:26 +05:30
Suraj Shetty	0a8939e1c1	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-29 08:56:22 +05:30
Saqib	675a8330a4	refactor: POS Invoice merging and cancellation (#24351 ) * feat: pos invoice merging with background jobs * fix: invoice threshold for queueing job * refactor: cancellation flow of point of sale * feat: tests for cancellation of pos closing Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-01-28 18:42:43 +05:30
Saqib	ac9e6ff704	fix(pos): multiple pos fixes and additions (#24227 ) * fix: make custom fields in pos invoice similar to sales invoice * feat: allow/disallow rate & discount change * fix: any pos profile can be selected while creating pos opening * fix: cannot add item to cart * fix: validate phone payment only if payment request exists * fix: replace pos payment method patch * chore: rearrange item & customer group filter * fix: allow/disallow invoice level discount * fix: updating qty of item with uom having space char * fix: move configuration checbox to config section * fix: invalid item rate trigger * fix: cannot remove item from draft invoices * fix: customer currency not set in pos invoice * fix: duplicate item error message * fix: sales uom not fetched in pos invoice * fix: cannot add taxes to pos invoice for uae region * fix: cannot merge pos invoice into credit note * fix: tax calculation while merging pos invoices * feat: delete draft orders from order list * fix: merging of pos invoice with pricing rules	2021-01-28 17:58:55 +05:30
Marica	ec4f42d4a9	Merge branch 'develop' into project-naming-series-patch	2021-01-25 11:29:23 +05:30
Deepesh Garg	164079127f	Merge pull request #24446 from deepeshgarg007/patch-fix-1-new fix: Project Template patch	2021-01-25 10:37:43 +05:30
Deepesh Garg	5b4ece5054	fix: Update patch	2021-01-22 17:12:35 +05:30
marination	7ba60570e7	fix: Spaces to Tabs	2021-01-22 16:55:06 +05:30
marination	c908deea61	fix: Patch to Add Naming Series to old projects	2021-01-22 16:10:01 +05:30
Deepesh Garg	cf7209f3d4	fix: Project Template patch	2021-01-22 11:47:13 +05:30
Rucha Mahabal	7201498801	Merge branch 'develop' into patient-history-enhancements	2021-01-22 09:04:37 +05:30
Rucha Mahabal	d98b506478	fix: patch	2021-01-21 13:23:59 +05:30
Rucha Mahabal	53d0eebbe8	fix: patch for renaming field in Membership Settings	2021-01-20 23:22:08 +05:30
Rucha Mahabal	bd02a42904	Merge branch 'develop' into membership-enhancements-2	2021-01-20 12:49:37 +05:30
Suraj Shetty	bbc6bfd3c3	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-19 09:34:06 +05:30
Rucha Mahabal	751719ea0d	Merge branch 'develop' into patient-history-enhancements	2021-01-14 14:08:50 +05:30
Anupam	5abb997a27	fix: resolved conflicts	2021-01-13 11:11:22 +05:30
Saqib	d43bb4db41	fix(pos): error while merging pos invoices into sales invoice (#24337 )	2021-01-11 12:59:35 +05:30
Jannat Patel	8a07de9ee0	Merge branch 'develop' into project-template-and-tasks	2021-01-11 10:57:09 +05:30
pateljannat	2460e101a7	fix: indicator ofor template task	2021-01-11 10:05:54 +05:30
Marica	5cfdd0f503	Merge branch 'develop' into qi-ux	2021-01-07 15:47:55 +05:30
pateljannat	fd5ebe9d4a	fix: patch and columns	2021-01-07 15:16:15 +05:30
Jannat Patel	a586b0ba17	Merge branch 'develop' into project-template-and-tasks	2021-01-07 13:01:02 +05:30
Deepesh Garg	e72c51204b	Merge pull request #24189 from timgates42/bugfix_typo_update docs: fix simple typo, udpate -> update	2021-01-06 09:34:11 +05:30
Marica	ba6e50b15e	Merge branch 'develop' into qi-ux	2021-01-05 15:15:10 +05:30
Anurag Mishra	b864b09d40	Merge branch 'develop' into gratuity	2021-01-05 14:47:38 +05:30
Marica	099162814c	Merge branch 'develop' into qi-ux	2021-01-05 09:27:40 +05:30
Afshan	0da201c6a5	fix: set company in leave allocation and leave ledger entry	2021-01-04 19:04:05 +05:30
Deepesh Garg	ffca52a348	Merge pull request #24254 from nextchamp-saqib/loan-patch-fix fix: update old loan patch	2021-01-01 13:50:52 +05:30
Saqib Ansari	d5d571ab9d	fix: update old loan patch	2020-12-31 12:55:35 +05:30
Saqib	fc7a11e2aa	fix (e-invoicing): item & invoice value calculation (#24253 )	2020-12-31 11:35:46 +05:30
Mohammad Hasnain Mohsin Rajan	11176852eb	Merge branch 'develop' into bugfix_typo_update	2020-12-30 20:59:38 +05:30
Saqib	f946bbd032	fix: minor e-invoicing issues (#24239 ) * fix: invoice value set to zero if rounded total disabled * fix: unit rate & gross amount calculation * fix: e-invoice-setup patch * chore: no need to re-run the patch * fix: item value & invoice value calculations	2020-12-30 14:43:42 +05:30
Anurag Mishra	dfe8f7601b	Merge branch 'develop' into gratuity	2020-12-29 13:27:03 +05:30
marination	a69e81a151	chore: Made 'Parameter' a link field in QI and QI Template - Added doctype Quality Inspection Parameter - Made 'Parameter' a link field in QI and QI Template - Added patch to create Quality Inspection Parameter records for every parameter in the system	2020-12-28 18:07:22 +05:30
pateljannat	71f203dbc5	fix: template task status, subject in project template task	2020-12-28 12:35:19 +05:30
Saqib	17e96901db	feat: GST E Invoicing (#23455 ) * feat: init e-invoice settings * feat: read public key file * feat: rsa encryption with public key * feat: save token and sek from auth request * chore: handle error response * feat: AES decryption of SEK with appkey * feat: decrypt json data with SEK * feat: make e invoice from erpnext sales invoice * feat: generate IRN * feat: decode signed json and QR code * chore: validations * feat: cancel IRN * feat: complete e-invoice schema * chore: move e-invoice settings to regional * chore: split einvoice settings and operations * chore: rename schema to template & js cleanup * feat: make IRN field on regional setup * feat: Generate & Cancel IRN from Sales Invoice * chore: minor fixes * fix: item discount * chore: show irn cancelled check after cancellation * fix: hide cancel irn dialog on error * fix: public key is required on validate * fix: cannot find attached key file * fix: validation if e invoicing is disabled * fix: do not show generate irn for invalid supply type * fix: update irn_cancelled after cancelling irn * chore: show irn field for proper gst_category * feat: e-way bill details in e-invoice * fix: save e-way bill no on irn generation * chore: no copy on e invoice custom fields * feat: cancel e-way bill before cancelling IRN * feat: manual download / upload json * chore: group e-invoicing actions * fix: fn name * chore: save signed invoice and qrcode after uplaoding irn * fix: fetch token if not valid * chore: move einvoicing stuff to seperate folder * feat: QRCode Image and E-Invoice Print Format * fix: bug * fix: invalid syntax * chore: code cleanup * chore: clean up e invoice actions * fix: download & upload e-invoice * fix: print format * fix: validations * fix: add permissions on regional setup * feat: add patch * fix: validate document name * fix: return date * fix: credit note einvoice * fix: validations * fix: error logging * fix: e_invoice module not found * fix: add missing package * fix: rename e_invoice_utils.py * fix: einvoice field validation * fix: patch * fix: invoice totals calculation * fix: other charges calculation * chore: improve document name validation message * fix: qr code image string * feat: initialize GSP connector * chore: remove unwanted fields * fix: qr code generation * feat: fetch and cache GSTIN details * feat: generate & cancel IRN * feat: cancel eway bill * chore: remove unwanted fuctions * chore: clean up einvoice actions * fix: attach qrcode on irn generation * fix: generate & cancel IRN * fix: show/hide eway bill fields * fix: valiations * feat: generate eway bill from IRN * chore: remove unwanted imports * chore: error logging * feat: header & footer in GST E Invoice * chore: remove test pincode * fix: invalid syntax * feat: cess non advolem on einvoice item * chore: remove fetch token from e invocie settings * fix: imports * fix: error handling * feat: update timeline on einvoice actions * fix: qrcode image size * fix: exclude intra company transactions * fix: eway bill test * fix: ewaybill mandatory conditions * chore: add tests * fix: returning condition * feat: log e-invocing requests * chore: add ack date and ack no field for print formats * fix: sider issues * feat: show e-invoice preview before IRN generation * fix: use as_list for error message * fix: minor ux issues * fix: dialog is undefined * fix: error handling * feat: add docs link to e invoice settings * feat: multiple gstins for e invoicing * fix: uncomment test condition * fix: remove test pincode * fix: cannot cancel irn without submitting sales invoice * chore: code cleanup * fix: sider issues * fix: e invoice request log permissions Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-25 20:55:21 +05:30
Saqib	6d74f5b59b	feat: GST E Invoicing (#23455 ) * feat: init e-invoice settings * feat: read public key file * feat: rsa encryption with public key * feat: save token and sek from auth request * chore: handle error response * feat: AES decryption of SEK with appkey * feat: decrypt json data with SEK * feat: make e invoice from erpnext sales invoice * feat: generate IRN * feat: decode signed json and QR code * chore: validations * feat: cancel IRN * feat: complete e-invoice schema * chore: move e-invoice settings to regional * chore: split einvoice settings and operations * chore: rename schema to template & js cleanup * feat: make IRN field on regional setup * feat: Generate & Cancel IRN from Sales Invoice * chore: minor fixes * fix: item discount * chore: show irn cancelled check after cancellation * fix: hide cancel irn dialog on error * fix: public key is required on validate * fix: cannot find attached key file * fix: validation if e invoicing is disabled * fix: do not show generate irn for invalid supply type * fix: update irn_cancelled after cancelling irn * chore: show irn field for proper gst_category * feat: e-way bill details in e-invoice * fix: save e-way bill no on irn generation * chore: no copy on e invoice custom fields * feat: cancel e-way bill before cancelling IRN * feat: manual download / upload json * chore: group e-invoicing actions * fix: fn name * chore: save signed invoice and qrcode after uplaoding irn * fix: fetch token if not valid * chore: move einvoicing stuff to seperate folder * feat: QRCode Image and E-Invoice Print Format * fix: bug * fix: invalid syntax * chore: code cleanup * chore: clean up e invoice actions * fix: download & upload e-invoice * fix: print format * fix: validations * fix: add permissions on regional setup * feat: add patch * fix: validate document name * fix: return date * fix: credit note einvoice * fix: validations * fix: error logging * fix: e_invoice module not found * fix: add missing package * fix: rename e_invoice_utils.py * fix: einvoice field validation * fix: patch * fix: invoice totals calculation * fix: other charges calculation * chore: improve document name validation message * fix: qr code image string * feat: initialize GSP connector * chore: remove unwanted fields * fix: qr code generation * feat: fetch and cache GSTIN details * feat: generate & cancel IRN * feat: cancel eway bill * chore: remove unwanted fuctions * chore: clean up einvoice actions * fix: attach qrcode on irn generation * fix: generate & cancel IRN * fix: show/hide eway bill fields * fix: valiations * feat: generate eway bill from IRN * chore: remove unwanted imports * chore: error logging * feat: header & footer in GST E Invoice * chore: remove test pincode * fix: invalid syntax * feat: cess non advolem on einvoice item * chore: remove fetch token from e invocie settings * fix: imports * fix: error handling * feat: update timeline on einvoice actions * fix: qrcode image size * fix: exclude intra company transactions * fix: eway bill test * fix: ewaybill mandatory conditions * chore: add tests * fix: returning condition * feat: log e-invocing requests * chore: add ack date and ack no field for print formats * fix: sider issues * feat: show e-invoice preview before IRN generation * fix: use as_list for error message * fix: minor ux issues * fix: dialog is undefined * fix: error handling * feat: add docs link to e invoice settings * feat: multiple gstins for e invoicing * fix: uncomment test condition * fix: remove test pincode * fix: cannot cancel irn without submitting sales invoice * chore: code cleanup * fix: sider issues * fix: e invoice request log permissions Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-25 10:26:43 +05:30
Nabin Hait	4da7a15ac0	fix: Fixed typo	2020-12-23 18:07:54 +05:30
Anurag Mishra	46e1c09b45	style: Broken into smaller function	2020-12-23 18:07:53 +05:30
Anurag Mishra	4d6c3c9449	Fix: Changes Requested, Sider, codacy, Transalation	2020-12-23 18:07:53 +05:30
Anurag Mishra	25c356894d	test: gratuity	2020-12-23 18:07:53 +05:30
Anurag Mishra	f63df91186	patch: to create standard Gratuity Rule for india and UAE	2020-12-23 18:07:53 +05:30
Tim Gates	1fb412e3f6	docs: fix simple typo, udpate -> update There is a small typo in erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py. Should read `update` rather than `udpate`.	2020-12-23 11:39:37 +11:00
Rucha Mahabal	7574a14d57	fix: Remove patch for setting next date in Subscription (#24158 )	2020-12-22 12:32:36 +05:30
pateljannat	9466e42e70	fix: change request modifications	2020-12-21 20:52:20 +05:30
pateljannat	79b71462cb	fix: patch	2020-12-17 18:21:34 +05:30
pateljannat	09f0e9111d	fix: patch	2020-12-17 17:20:21 +05:30
pateljannat	2dbb1d6bc7	fix: indentation	2020-12-17 15:49:52 +05:30
pateljannat	2f4c88b228	Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks	2020-12-17 11:56:06 +05:30
pateljannat	f2bff8e220	fix: patch relaod doctype	2020-12-17 11:54:59 +05:30
Jannat Patel	28098d6f93	Merge branch 'develop' into project-template-and-tasks	2020-12-16 20:09:27 +05:30
Rucha Mahabal	21168eab7f	fix: Remove patch for setting next date in Subscription (#24158 )	2020-12-16 19:39:34 +05:30
pateljannat	87b477a311	feat: patch for project template tasks	2020-12-16 13:37:21 +05:30
Rucha Mahabal	02ebc9a11e	Merge branch 'develop' into patient-history-enhancements	2020-12-16 12:51:45 +05:30
Suraj Shetty	f2511c84b5	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-14 09:05:48 +05:30
Deepesh Garg	ced3b13492	fix: Check for paid field	2020-12-12 19:31:05 +05:30
Deepesh Garg	68fce6d029	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix	2020-12-12 19:28:50 +05:30
Rushabh Mehta	fec8dba16c	fix(merge): merge develop	2020-12-08 16:23:09 +05:30
Walstan Baptista	0baebbdafe	fix: added Purchase Order to Global Search (#24055 )	2020-12-08 09:43:29 +05:30
Rucha Mahabal	063be69b58	fix(patch): set update_modified to False while setting issue/opportunity metrics (#24073 )	2020-12-07 10:41:05 +05:30
rohitwaghchaure	0a672b69e6	Merge pull request #22859 from marination/pr-dn-return feat: Return tracking in PR/DN	2020-12-06 22:43:34 +05:30
Deepesh Garg	2d1cfae596	fix: fieldname	2020-12-05 22:44:45 +05:30
Anurag Mishra	26b3328af7	fix: leave policy assignment patch (#24061 )	2020-12-04 19:50:24 +05:30
Rucha Mahabal	288853d8f0	Merge branch 'develop' into patient-history-enhancements	2020-12-01 13:44:16 +05:30
Afshan	ccf5dc66e2	feat: multi-currency payroll (#23519 ) * feat: multi-currency payroll * fix: refactor and added conditions * fix: uncommented code * style: removed comments * fix: missing argument * style: styling changes * fix: test cases * Update asset_value_adjustment.py * patch: update columns * style: formating * style: formatting * fix: 1st review * fix: refactor * Revert "fix: refactor" This reverts commit eca0e17d11a192d60f249b2af992971c625aec46. reverting to previous state * Revert "fix: 1st review" This reverts commit 7eac48b102157df4353598f73b2ea97308af436a. reverting before 1st review * fix: 2nd review changes * fix: test cases * fix: added call to fetch exchange rate * fix: remove unnecessary code * fix: refactor * fix: refactor patch * fix: refactor * fix: refactor * fix: clear test data * fix: slider * feat: multi-currency payroll * fix: refactor and added conditions * fix: uncommented code * style: removed comments * fix: missing argument * style: styling changes * fix: test cases * patch: update columns * Update asset_value_adjustment.py * style: formating * style: formatting * fix: 1st review * fix: refactor * Revert "fix: refactor" This reverts commit eca0e17d11a192d60f249b2af992971c625aec46. reverting to previous state * Revert "fix: 1st review" This reverts commit 7eac48b102157df4353598f73b2ea97308af436a. reverting before 1st review * fix: 2nd review changes * fix: test cases * fix: added call to fetch exchange rate * fix: remove unnecessary code * fix: refactor * fix: refactor patch * fix: refactor * fix: refactor * fix: clear test data * fix: slider * feat: Added company field in leave encashment and employee benefit * refactor: Refactored multi-currency payroll patch * fix: currency column in salary register * refactor: Refactored code for making bank and return entry against employee advance * fix: minor cleanup * fix: fixed translation * fix: removed salary component type * fix: fixed sider issues * fix: translation and slider * style: formatted msg * fix: fixed slider * fix: travis * fix: refactor * fix: slider * fix: slider * fix: slider * fix: travis * fix: patch * fix: patch * fix: travis * fix: travis * fix: travis * fix: travis * fix: travis * fix: travis * fix: re-run travis * fix: rerun travis * fix: rerun travis * fix: rerun travis * fix: travis rerun * fix: increased throttle_user_limit from 60 to 100 * fix: patch * fix: patch * fix: assign payroll payable account as default payroll payable account in SSA * fix: removed debugger * fix: slider Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-01 09:11:05 +05:30
Rucha Mahabal	f6756838ba	fix: patch	2020-11-30 17:51:56 +05:30
Rucha Mahabal	7a69a3367c	Merge branch 'develop' into patient-history-enhancements	2020-11-30 14:16:46 +05:30
Rucha Mahabal	f3df5c9f3c	feat: patch to setup standard doctype config in Patient History Settings	2020-11-30 12:16:28 +05:30
Deepesh Garg	452cbcd6ea	fix: Update payments directly in Loan Interest Accrual	2020-11-30 10:55:12 +05:30
Deepesh Garg	681c0e297c	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix	2020-11-29 23:07:14 +05:30
Marica	307bd01504	Merge branch 'develop' into pr-dn-return	2020-11-25 17:24:03 +05:30
Anurag Mishra	755b773616	feat: Leave policy assignment (#23112 ) * feat: Leave Policy Assignment * feat: linking with leave allocation and valiations * style: removed old code from leave period * feat: Bulk Leave policy Assignment and grant Leaves * fix: overlap validation * feat: earned leaves based on joining date * feat: automatic grant leave based on leave policy * patch: create leave policy assignment based on employee current leave policy * fix: dependent test cases * test: Leave policy assignment * fix: some enhancement * style: break large function into small function * fix:requested Changes * fix(patch): Handled old Leave allocatioln * fix:codacy * fix: travis and sider,codacy * fix: codacy * fix: codacy * fix: requested changes and sider Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-11-25 16:05:17 +05:30
Nabin Hait	93bb7b0000	Merge branch 'develop' into membership-enhancements-2	2020-11-19 13:05:17 +05:30
Marica	9b897c4073	Merge branch 'develop' into pr-dn-return	2020-11-19 12:21:38 +05:30
Suraj Shetty	5e8b00207b	fix: Typo (Enchashment > Encashment) (#23919 )	2020-11-17 10:58:09 +05:30
Deepesh Garg	a862eb25e6	fix: Make repayment entry only if amount exists	2020-11-13 17:57:57 +05:30
Deepesh Garg	37dc369af9	feat: Sync old shopify orders (#23841 ) * feat: Sync old shopify orders * fix: Old orders syncing by date * fix: Remove unnecessary code * fix: Remove unintentional changes Co-authored-by: Saurabh <saurabh@erpnext.com>	2020-11-13 16:53:35 +05:30
Deepesh Garg	78690af440	fix: Update only if loans to close	2020-11-12 18:47:34 +05:30
Deepesh Garg	c51b340ddf	fix: Update closed loans	2020-11-12 18:43:43 +05:30
Deepesh Garg	b58dca8d94	fix: Only update open loans	2020-11-12 13:37:11 +05:30
Shivam Mishra	bed717b442	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-12 11:32:59 +05:30
Deepesh Garg	a2dc1740df	fix: Use autoname for loan creation	2020-11-11 13:57:10 +05:30
Deepesh Garg	0dc052e635	fix: Return loan type name	2020-11-11 12:57:16 +05:30
Deepesh Garg	13d1dda74b	fix: Handle loan type naming collisions	2020-11-11 11:07:17 +05:30
Deepesh Garg	73bde45bc5	fix: Pass updated loan type	2020-11-10 22:08:02 +05:30
Deepesh Garg	1c969d64a2	fix: Handle cases where same loan type is used for multiple companies	2020-11-10 20:25:35 +05:30
Deepesh Garg	928dc432ab	fix: Reload journal entry account doc	2020-11-09 17:17:12 +05:30
Deepesh Garg	4f2a64479d	fix: Patch for old loans	2020-11-09 17:00:09 +05:30
Shivam Mishra	9d9fa74e6b	refactor(member): drop email column * remove email column * update controller methods * add patch to add value from email to email_id	2020-11-09 14:06:23 +05:30
Marica	d845e8a53a	Merge branch 'develop' into pr-dn-return	2020-11-06 12:25:11 +05:30
Afshan	5c93ca7bef	fix: leave ledger patch (#23807 ) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-11-05 15:45:15 +05:30
marination	28dd90f3dc	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return	2020-11-02 15:16:31 +05:30
marination	d6596a169c	fix: Billing % Logic and Map Pending Qty only in PR and DN - Billing % should consider unreturned amount as total - While mapping to return doc, map unreturned amount - Added field Received Qty in Stock UOM, to tally against Returned Qty in PR - PR billing percentage updation custom function - In patch set received qty in stock uom first, then update returned qty and billing	2020-11-02 15:07:48 +05:30
Rohit Waghchaure	e1781dc0bb	fix: patch to update reason for leaving in employee	2020-10-30 15:34:04 +05:30
Marica	7496ac0fe2	Merge branch 'develop' into pr-dn-return	2020-10-28 11:54:01 +05:30
Rushabh Mehta	1dd54e457d	Merge pull request #23734 from rmehta/quality-form-cleanup fix(cleanup): Quality Module, cleanup of forms, dashboards etc.	2020-10-28 11:36:00 +05:30
Marica	cf8698fb0b	Merge branch 'develop' into pr-dn-return	2020-10-27 15:34:51 +05:30
Rushabh Mehta	ea49e30bfd	fix(cleanup): cleaned up forms	2020-10-26 15:30:52 +05:30
Rucha Mahabal	4887b69946	feat: Inpatient Medication Order and Entry (#23473 ) * feat: Inpatient Medication Order * feat: Inpatient Medication Entry * feat: update medication orders on medication entry submission * feat: added custom fields for medication references in Stock Entry * feat: make stock entry if update stock is checked in IPMOE * fix: handle cancel event for Inpatient Medication Entry * fix(ux): add link and progress bar to dashboard * refactor(ux): Adding Medication Orders without linking to Patient Encounter * fix: make medication entry child table read only * fix: filter stock items during manual medication order creation * fix: codacy * chore: tests for Inpatient Medication Order * chore: tests for Inpatient Medication Entry * fix: code clean-up * fix: filter for inpatients in IPMO * fix: add datetime validations for IPME filters * fix: do not hardcode stock entry type Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 20:33:30 +05:30
Mangesh-Khairnar	5c29eb08c4	Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration	2020-10-19 18:29:46 +05:30
Mangesh-Khairnar	ebb8ee3dc6	fix(payment gateway account): add patch to set the payment channel as email	2020-10-19 18:27:40 +05:30
Shivam Mishra	55f52e8135	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-13 20:09:22 +05:30
Marica	50b708f615	Merge branch 'develop' into pr-dn-return	2020-10-13 16:57:11 +05:30
Rohit Waghchaure	a86cab0bb2	fix: added patch to make custom field 'Print UOM after Quantity'	2020-10-08 16:41:23 +05:30
Shivam Mishra	1323a9a990	feat: set app name for ERPNext in install and patch	2020-09-30 16:33:14 +05:30
Rucha Mahabal	46d4180381	refactor: Issue form cleaned up and renamed Minutes to First Response field (#23066 ) * refactor: re-order fields in Issue DocType * refactor: rename Mins to First Response to First Response Time * refactor: First Response Time Reports for Issue and Opportunity * fix: added patch for renamed fields and setting durations * chore: update CRM and Support Desk Pages for Response Time reports * fix: first response time for opportunity report * fix: patch Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-09-23 16:53:16 +05:30
Marica	ef2b5e8284	Merge branch 'develop' into pr-dn-return	2020-09-22 15:39:25 +05:30
gavin	d935b2753f	Merge branch 'develop' into youtube-analytics	2020-09-22 15:36:00 +05:30
Rohan	e42f08085b	fix: use Plaid's new API (develop) (#23318 ) Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>	2020-09-21 13:14:07 +05:30
Marica	1807437fe0	Merge branch 'develop' into youtube-analytics	2020-09-11 16:18:23 +05:30
Marica	4153a9f8de	Merge branch 'develop' into pr-dn-return	2020-09-11 16:10:48 +05:30
Saqib	cd89994b33	fix: multiple pos issues (#23297 ) * fix: returns can be made against unconsolidated invoices * fix: indentation * fix: mode of payment not fetching for pos returns * patch: default pos profile print format * fix: tests * chore: clean up retail desk page	2020-09-10 19:28:46 +05:30
Marica	6520655d59	Merge branch 'develop' into youtube-analytics	2020-09-10 10:16:02 +05:30
marination	53cd60c217	fix: Patch reload doctype	2020-09-09 20:57:10 +05:30
marination	dc5f2aa8b8	chore: Patch to set returned qty in PR and DN	2020-09-09 17:56:20 +05:30
Marica	52e87d1a4f	Merge branch 'develop' into pr-dn-return	2020-09-09 11:56:26 +05:30
Saqib	ec6a97fb6a	fix: cannot delete pos page if linked with desk page (#22993 ) * fix: cannot delete pos page if linked with desk page * fix: replace pos page links with point-of-sale page Co-authored-by: gavin <gavin18d@gmail.com>	2020-09-09 10:54:14 +05:30
marination	8484d1cd95	fix: Patch and test codacy	2020-09-08 20:58:33 +05:30
Anupam Kumar	68b069983d	Merge branch 'develop' into email-digest	2020-09-07 20:22:25 +05:30
Marica	54ab426c1c	Merge branch 'develop' into youtube-analytics	2020-09-07 18:54:11 +05:30
marination	06ee0ea00b	feat: Added Scheduler Job to auto update statistics - Added frequency in Video Settings - Cron job to check half hourly job - Hourly job to run job based on frequency - Patch to set youtube id in video for ease in computing	2020-09-07 18:49:06 +05:30
Mangesh-Khairnar	06130ee56b	fix: leave ledger patch (#23182 )	2020-09-07 11:53:50 +05:30
Anupam Kumar	3775324441	Merge branch 'develop' into email-digest	2020-09-06 21:49:43 +05:30
Anurag Mishra	54cd194b41	feat: removed roles for some reginal report and added via setup	2020-09-03 13:52:40 +05:30
rohitwaghchaure	efd1ac5840	Merge pull request #23050 from anupamvs/stock-entry-type fix: deleting unused Stock Entry Type	2020-09-02 11:43:29 +05:30
Anupam K	8d0de8c311	Merge branch 'develop' of https://github.com/frappe/erpnext into email-digest	2020-08-31 16:54:36 +05:30
Anupam K	ddfc104239	fix: patch	2020-08-31 16:54:16 +05:30
Shivam Mishra	b4e0d300f7	Merge branch 'develop' into iff-invoicing	2020-08-31 11:46:41 +05:30
Deepesh Garg	ecc282930a	Merge branch 'develop' into navbar_links	2020-08-28 12:48:46 +05:30
Rushabh Mehta	73f648473f	fix(minor): update_start_end_date_for_old_shift_assignment.py	2020-08-26 14:51:37 +05:30
Rushabh Mehta	a163d8bc84	fix(minor): rename_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	544d18327c	fix(patch): quotation_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	38fad58834	fix(patch)	2020-08-26 14:51:37 +05:30
Anupam K	01b37ad704	fix: multiselect recipients in Email Digest	2020-08-25 08:39:26 +05:30
Shivam Mishra	d5971d3c59	Merge branch 'develop' into iff-invoicing	2020-08-20 08:16:22 +00:00
Raffael Meyer	585f1f67b7	Merge branch 'develop' into navbar_links	2020-08-19 18:55:44 +02:00
Raffael Meyer	2c26144a6b	Update erpnext/patches/v13_0/add_standard_navbar_items.py	2020-08-19 18:55:06 +02:00
Anurag Mishra	13be09e883	Update update_start_end_date_for_old_shift_assignment.py	2020-08-17 13:43:33 +05:30
Anupam K	d7b69e57ae	fix: deleting unused Stock Entry Type	2020-08-17 11:20:56 +05:30
Shivam Mishra	733bde31c9	fix: doctype name in patch	2020-08-14 13:46:58 +05:30
Shivam Mishra	1678eb9b50	feat: drop payload column	2020-08-14 13:46:58 +05:30
Anurag Mishra	f096ba4998	patch: Old Shift Assignment	2020-08-13 14:18:48 +05:30
Anupam Kumar	e447c79f9d	fix: Quotation lost reason options fix (#22814 ) * adding patch and lost reason child tables * fix: conflict resolved	2020-08-13 09:20:36 +05:30
Deepesh Garg	21a220e2a5	fix: Update state code and union territory for Daman and Diu (#22988 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-12 19:19:03 +05:30
Deepesh Garg	617027c6ca	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-12 18:39:20 +05:30
Anupam Kumar	674d1b0803	feat: Material Request and Stock Entry Enhancement (#22671 ) * feat: send to warehouse * adding warehouse validation * fix: review changes * fix: review changes * stock entry enhancement * fix: review changes	2020-08-12 17:55:02 +05:30
Deepesh Garg	bad269c354	fix: Parent income account check	2020-08-07 16:21:41 +05:30
Deepesh Garg	b98088bb01	Merge branch 'develop' into loan_patch_and_fixes	2020-08-07 13:27:40 +05:30
Deepesh Garg	a306af8c08	fix: Add help link in navbar settings	2020-08-06 20:52:02 +05:30
Rucha Mahabal	a78336e77d	fix: remove patch for retaining permissions for Video DocType (#22932 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-06 19:01:42 +05:30
Nabin Hait	701474cbaa	fix: POS patch fix (#22818 )	2020-07-28 09:11:37 +05:30
Afshan	ecb1460440	fix: update the project after task deletion so that the % completed s… (#22591 ) * fix: update the project after task deletion so that the % completed shows correct value * fix: patch to correct % complete of previous projects * fix: for version-13 * fix: removed patch from v13 Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-24 10:48:16 +05:30
Saqib	a6f98d48bc	refactor: POS workflow (#20789 ) * refactor: add pos invoice doctype replacing sales invoice in POS * refactor: move pos.py to pos invoice * feat: add pos invoice merge log doctype * feat: ability to merge pos invoices into a sales invoice * feat: [wip] new ui for point of sale * fix: pos.py moved to pos_invoice * feat: loyalty points for POS Invoice * fix: loyalty points on merging * feat: return against pos invoices * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: status fix and set warehouse from pos profile * fix: naming series * feat: merge pos returns into credit notes * feat: add pos list action for merging into sales invoices * feat[UX]: add shortcuts & focus on search after customer selection * feat: stock validation from previous pos transactions * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: fix df not found for base_amount precision * feat: serial no validation from previous pos transactions * chore: move pos.py into pos page * feat: pos opening voucher * feat: link pos closing voucher with opening voucher * chore: use map_doc instead of get_mapped_doc for better perf * feat: enforce opening voucher on pos page * feat: [ui] [wip] point of sale beta ui refactor * fix: auto fetching serial nos with batch no * feat: [ui] item details section for new pos ui * feat: remove item from cart * refactor: [ui] [wip] split point_of_sale into components * new payment component * new numberpad * fix pos opening status * move from flex to grids * fix: search from item selector * feat: loyalty points as payment method * feat: pos invoice status * fix a bug with invalid JSON * fix: loyalty program ui fixes * feat: past order list and past order summary * feat: (minor) setting discount from item details * fix: adding item before customer selection * feat: post order submission summary * save and open draft orders * fix: item group filter * fix: item_det not defined while submitting sle * fix: minor bugs * fix: minor ux fixes * feat: show opening time in pos ui * feat: item and customer images * feat: emailing and printing an invoice * fix: item details field edit shows empty alert * fix: (minor) ux fixes * chore: rename pos opening voucher to pos opening entry * chore: (minor) rename pos closing voucher and sub doctypes * chore: add patch for renaming pos closing doctypes * fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation * fix: invoices not getting fetched on pos closing * fix: indentation * feat: view / edit customer info * fix: minor bugs * fix: minor bug * fix: patch * fix: minor ux issues * fix: remove uppercase status * refactor: pos closing payment reconciliation * fix: move pos invoice print formats to pos invoice doctype * fix: ui issues * feat: new child doctype to store pos payment mode details * fix: add to patches.txt * feat: search by serial no * chore: [wip] code cleanup * fix: item not selectable from cart * chore: [wip] code cleanup * fix: minor issues * loyalty points transactions * default payment mode * fix: minor fixes * set correct mop amount with loaylty points * editing draft invoices from UI * chore: pos invoice merge log tests * fix: batch / serial validation in pos ui and on submission * feat: use onscan js for barcode scan events * fix: cart header with amount column * fix: validate batch no and qty in pos transactions * chore: do not fetch closing balances as opening balance * feat: show available qty in item selector * feat: shortcuts * fix: onscan.js not found * fix: onscan.js not found * fix: cannot return partial items * fix: neagtive stock indicator * feat: invoice discount * fix: change available stock on warehouse change * chore: cleanup code * fix: pos profile payment method table * feat: adding same item with different uom * fix: loyalty points deleted after consolidation * fix: enter loyalty amount instead of loyalty points * chore: return print format * feat: custom fields in pos view * chore: pos invoice test * chore: remove offline pos * fix: cyclic dependency * fix: cyclic dependency * patch: remove pos page and order fixes * chore: little fixes * fix: patch perf and plural naming * chore: tidy up pos invoice validation * chore: move pos closing to accounts * fix: move pos doctypes to accounts * fix: move pos doctypes to accounts * fix: item description in cart * fix: item description in cart * chore: loyalty tests * minor fixes * chore: rename point of sale beta to point of sale * chore: reset past order summary on filter change * chore: add point of sale to accounting desk * fix: payment reconciliation table in pos closing * fix: travis * Update accounting.json * fix: test cases * fix: tests * patch loyalty point entries * fix: remove test * default mode of payment is mandatory for pos transaction * chore: remove unused checks from pos profile * fix: loyalty point entry patch * fix: numpad reset and patches * fix: minor bugs * fix: travis * fix: travis * fix: travis * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 18:51:26 +05:30
Anoop	23481cc484	feat: Laboratory Module Enhancements (#22416 ) * feat: option to add organism count in descriptive tests print format to accommodate descriptive test changes fix: refactoring, clean up wip * lab test - result based on secondary uom, result format options lab test print - consider result format options, result legend and worksheet instructions * feat: option to allow results blank in lab test if configured via lab test template * fix: rename child doctypes, rename related links * fix: field display depends on, cleanup - rename fields and variables * fix: get from encounter popup layout, code cleanup and minor fixes * fix: sms send dialog bug * fix: lab test get from encounter html class name typo corrected * fix: lab test organisms depends on condition * fix: reorder fields - depends on fields brought together * fix: PR review feedback, removed : separator, result formatting applied to result UOM * fix: child table js removed * fix: internal field require_result_value hidden, secondary uom result field type set to data * fix: Use ORM methods instead of db.sql, code cleanup, style * fix: create item price for lab test template if billable, code cleanup * fix: patch rename doctypes before fields, deleted renamed child doctypes * fix: secondary uom result calc - warn user if calculation fails * fix: patch to insert entries into renamed child tables * fix: codacy issues * fix: patch duplicate error as items are already migrated in v12 migrate organisms child table field name updated * fix: patch a bit lenghty, added comments * fix: patch * fix: require_result_value flag marked hidden * fix: code cleanup-up * fix: patch - lab_test rename field, lab_test_group_template select option corrected Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-23 15:00:54 +05:30
Deepesh Garg	9c49f2d886	feat: Enhancement in subscription (#22263 ) * feat: Add supplier in subscription doctype * fix: Code cleanup * fix: Add dynamic link in subscription invoices * fix: Multiple enhanccement in subscription * feat: Follow calendar months in subscription * fix: Test Cases and patch * fix: Patch * fix: Update patch and add fixes * fix: Update permission for subscription settings * fix: Patch and Test * fix: Add cost center dimension in Subscripiton	2020-07-23 11:11:23 +05:30
Marica	2ee64ceaff	Merge branch 'develop' into club-mr-column	2020-07-22 18:52:10 +05:30
Deepesh Garg	7c50f421e1	fix: Move branch code back to bank account (#22725 ) * fix: Move branch code back to bank account * fix: Patch	2020-07-22 18:21:04 +05:30
sahil28297	3d3c922d7f	fix(patch): handle duplicate entry error while inserting account (#22745 )	2020-07-22 16:42:31 +05:30
Afshan	6b9acf4476	updated patch to delete auto email reports and moved patch to v13 from v12	2020-07-22 16:00:18 +05:30
Marica	8ec4198af2	Merge branch 'develop' into club-mr-column	2020-07-20 16:07:10 +05:30
Deepesh Garg	04e8af7dca	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes	2020-07-20 09:53:26 +05:30
Rohit Waghchaure	07cc918d70	fix: patch update_actual_start_and_end_date_in_wo	2020-07-15 16:41:32 +05:30
Afshan	e9affe3705	merge branch develop	2020-07-10 16:31:40 +05:30
Afshan	0863beec92	created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport"	2020-07-10 15:14:01 +05:30
rohitwaghchaure	41c9708f99	Merge branch 'develop' into project-link-for-all-accounts	2020-07-08 13:11:37 +05:30
Deepesh Garg	92a03aa5db	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-07-06 12:37:28 +05:30
Deepesh Garg	be05c4e14a	fix: Codacy and minor fixes	2020-07-05 18:16:16 +05:30
mohammadahmad1990	f933cf80df	Patch for Updating item Tax Template Company	2020-07-03 15:04:37 +05:00
Deepesh Garg	50e6e47e66	fix: Patch	2020-06-28 21:32:08 +05:30
Deepesh Garg	eca2c1cd93	fix: patch	2020-06-28 18:53:55 +05:30
vishdha	d3ec1c1d89	feat: Taxjar Integration Added	2020-06-24 16:37:21 +05:30
Deepesh Garg	7cc1cf36ca	feat: More controlled deferred revenue booking (#21671 ) * feat: More controller deferred revenue booking * fix: Query for last gl entry * fix: Accounting Dimension for Deferred entries * fix: Deferred revenue booking against paid invoices * fix: Don not update outstanding on Deferred Entry submission * fix: Naming fixes * feat: Deferred revenue/expense booking based on months * fix: Test case for fix monthly deferred revenue booking * fix: Typo * fix: Patch to update settings * fix: Test case to book deferred expense via journal entry * fix: Update field for better UX * fix: Codacy * fix: Change select field to checkbox	2020-06-23 09:57:56 +05:30
Anurag Mishra	8ffb9f852f	fix: patch check_is_income_tax_component (#22371 )	2020-06-22 12:17:29 +05:30
Deepesh Garg	edd4aa6faa	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-22 09:59:39 +05:30
Anurag Mishra	289c82243f	feat: New Payroll module (#21990 ) * feat: Moved Document to Payroll Module * feat: Moved Reports to Payroll Module * feat: Moved Print fromat With Patch * feat: Moved Notifiction to Payroll Module and patches * feat: added dashboard and desk page to Payroll * feat: Payroll Dashboard * feat: Module onboarding * feat: Income tax Deductions Report * feat: Ecs Checklist Report * feat: Provident Fund Report * feat: Professional Fund report and commonified Code * feat: Total Payments Based On Payment Mode Report * fix: refactor and added chart Total Payments Based On Payment Mode * feat: Payroll Settings * fix: Bank remittance Report * feat(Payroll based on): Considered unmarked days * feat: Added Help for condition an formula in Salary structure * fix: requested changes * fix: rename report Ecs checklist to salary_payments_via_ecs * fix: renamed report report/total_payments_based_on_payment_mode * fix: added role via setup.py for regional report * feat: added All reports to desk page * fix: frappe.reload doc in all patches * fix: codacy * fix: frappe.reload_doctype for patches * patch: is_income_tax_component and component_type for salary component * fix: uncommented code * test: fixture * fix: test * test: test_payment_days_based_on_attendance	2020-06-19 19:17:57 +05:30
Marica	383807f72e	feat: Selling Desk, Dashboard and Onboarding (#22055 ) * feat: Selling Desk, Dashboard and Onboarding * chore: Selling Onboarding and fixes in Other onboardings * chore: Dashboard and Number card Fixtures * fix: Escape filters and Reposition Accounts Dashboard shortcut. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-19 15:33:21 +05:30
Deepesh Garg	3c63f5b76b	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-19 11:41:21 +05:30
Rucha Mahabal	428235c478	fix: revert issue metrics patch (#22331 )	2020-06-19 11:15:59 +05:30
rohitwaghchaure	853fce8c7e	Merge branch 'develop' into rfq-multi-uom	2020-06-18 15:49:53 +05:30
Rucha Mahabal	a529d71ca0	fix(patch): add patch for setting issue metrics (#22296 ) * patch: set issue metrics in Issue documents * fix: commit after every 100 records	2020-06-18 15:38:43 +05:30
Marica	d6906dccfe	Merge branch 'develop' into rfq-multi-uom	2020-06-18 14:44:46 +05:30
marination	95e9a4ef2c	fix: Patch simplification - Also, apply patch to all docs	2020-06-18 14:46:42 +05:30
Anupam Kumar	0a3c34de01	address label chages (#22137 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-17 10:53:13 +05:30
Rohit Waghchaure	fa6e4f62e2	fix: travis for develop	2020-06-16 12:02:58 +05:30
marination	87dafb4d70	Merge branch 'develop' of https://github.com/frappe/erpnext into rfq-multi-uom	2020-06-15 17:44:04 +05:30
marination	ae862c993b	feat: Multi UOM support in Request for Quotation	2020-06-15 17:38:47 +05:30
Rucha Mahabal	096792791b	fix(patch): reload child tables	2020-06-15 14:07:06 +05:30
Rucha Mahabal	bf26b10df4	Merge branch 'develop' into sla-enhancements	2020-06-15 13:15:03 +05:30
Sahil Khan	182c1f860b	fix(patch): escape special characters in company field	2020-06-12 15:16:20 +05:30
Abhishek Balam	86ea75e49e	fix(HR): Change Due Advance Amount to Pending Amount (#22123 ) * rename 'Due Advance Amount' field to 'Pending Amount' * changed fieldname and references for easier debugging * added patch for moving data * added newline added Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-12 13:13:14 +05:30
Rucha Mahabal	d7481f59ba	fix: patch	2020-06-11 17:41:05 +05:30
Rucha Mahabal	5b6d2c2e7b	Merge branch 'develop' into sla-enhancements	2020-06-10 12:33:19 +05:30
Rucha Mahabal	73326d308b	refactor: move pause SLA configuration to SLA DocType	2020-06-05 18:23:39 +05:30
Rucha Mahabal	25ef6a9638	fix: add default hold statuses in fixtures and patch	2020-06-05 16:37:20 +05:30
Rucha Mahabal	3f08350181	fix: retain Hold status	2020-06-04 15:56:59 +05:30
Rucha Mahabal	b3338a149b	fix: code clean-up	2020-06-04 12:35:00 +05:30
Nabin Hait	2186c223b9	fix: Migrate standard_tax_exemption_amount if field exists (#22036 )	2020-05-29 21:26:49 +05:30
Deepesh Garg	dfa32a77c1	fix: Patch to remove Property Setter	2020-05-29 17:20:33 +05:30
Chinmay D. Pai	d6587fa1d5	fix: check if swift_number exists in bank account Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-29 12:44:09 +05:30
Rucha Mahabal	43d4397003	Merge branch 'develop' into sla-enhancements	2020-05-29 11:43:49 +05:30
Rucha Mahabal	bc38289a59	fix: added patch for sla enhancements	2020-05-29 11:43:05 +05:30
sahil28297	9209b9a7de	fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016 )	2020-05-28 18:49:47 +05:30
sahil28297	517ab955ac	fix(rename_bank_reconcilliation): do not delete doc after renaming (#22013 )	2020-05-28 18:32:16 +05:30
Marica	1a25aa83de	fix: Delete Auto Email Reports (#22009 )	2020-05-28 18:16:24 +05:30
marination	29d7a7ea05	fix: Added permission via regional setup and patch	2020-05-27 22:14:36 +05:30
Marica	c2aabb0fbf	fix: Buying Module fixes (#21965 ) * fix: Buying Module fixes * fix: Delete Report files as well * fix: Add Purchase Order Analysis to Stock & Accounting	2020-05-27 20:56:39 +05:30
Prssanna Desai	ee70d7a7eb	fix: fix function import (#21927 )	2020-05-26 17:02:51 +05:30
Rucha Mahabal	316d136aca	fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes (#21907 ) * fix: unhide company field in Sample Collection * fix: add and set company field in rehab doctypes	2020-05-25 18:41:47 +05:30
Vishal Dhayagude	6ff11de2f0	fix: Added gram, pound to ounce conversion (#21709 ) * fix: pound, grams to Ounce converion factor added * fix: patch date updated for UOM Conversion Factor * fix: grams move to gram * fix: duplicate entry of uom converion factor and patch added * fix: typo fix * fix: minor changes * Update patches.txt Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-25 14:54:19 +05:30
Nabin Hait	78a6b6b45d	fix: Remove duplicate leave ledger entry (#21871 ) * fix: Remove duplicate leave ledger entry * fix: Remove duplicate leave ledger entry	2020-05-22 13:13:17 +05:30
Chinmay Pai	baef43977b	fix: set customer and supplier details using sql (#21846 ) * fix: set customer and supplier details using sql instead of slowing down the query with get_doc and save() we can just use sql to update the required values for customer and supplier Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> * chore: remove extra quote Co-authored-by: Himanshu <himanshuwarekar@yahoo.com> * fix: update sql query to include tabPrice List Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-05-22 10:50:13 +05:30
Marica	dd3e52184c	fix: Added Inactive serial no status (#21848 )	2020-05-22 10:48:35 +05:30
sahil28297	82523a5487	fix(set_serial_no_status): auto commit on many writes (#21845 )	2020-05-21 18:42:10 +05:30
Suraj Shetty	5cef8db4db	fix(patch): Handle single value in patch (#21823 )	2020-05-21 14:32:24 +05:30
Marica	91a9d3fbe5	fix: Reload doc in Healthcare company patch (#21808 )	2020-05-20 16:12:46 +05:30
Rucha Mahabal	99d348ffa3	fix: Patch for Setting Missing Company in Healthcare DocTypes (#21790 ) * fix: patch for setting missing company in Healthcare DocTypes * fix: check doctype exists Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-19 20:28:19 +05:30
rohitwaghchaure	aa85e511da	feat: Production Planning Against Sales Order/Material Request/Work Order (#21763 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-19 19:51:45 +05:30
Nabin Hait	f2fb9368db	fix: manufacturing dashboard	2020-05-19 12:32:39 +05:30
rohitwaghchaure	be750096ed	fix: bom incorrect price list rate for raw material if price list currency is different from company currency (#21585 ) * fix: bom incorrect price list rate for raw material if price list currency is different from company currency * fixed test cases * fixed base_rate calculation and added plc_conversion_rate trigger	2020-05-18 14:23:30 +05:30
Rohit Waghchaure	366bce678f	added onboarding for manufacturing	2020-05-18 11:57:25 +05:30
Rohit Waghchaure	34f4a2398b	feat: manufacturing dashboards	2020-05-18 11:57:25 +05:30
Deepesh Garg	a8807e2696	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes	2020-05-18 11:52:39 +05:30
Marica	f4f307c36a	fix: Patch to set status in old serial no data (#21720 ) * fix: Patch to set status in old serial no data * fix: Avoid get_doc in patch * fix: fetch all values and check status in one query	2020-05-18 11:18:44 +05:30
Deepesh Garg	a63fda9097	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes	2020-05-17 23:37:05 +05:30
Deepesh Garg	5ccefdc08a	fix: Patch to update old loans	2020-05-17 23:26:59 +05:30
rohitwaghchaure	2ee400989b	Merge pull request #21273 from marination/quoted-item-report refactor: Quoted Item Comparison Report	2020-05-15 13:47:48 +05:30
Deepesh Garg	7d61c03af4	fix: Add missing dimensions in GL entries (#21689 ) * fix: Add misssing dimensions in GL entries * fix: Add project filter in trial balance report * fix: Use current dimensions instead of dimensions from asset	2020-05-15 12:58:48 +05:30
Mangesh-Khairnar	f984bee5f9	fix: duplicate leave expiry creation (#21505 ) * fix: validate existing ledger entries to avoid duplicates * patch: remove duplicate ledger entries created * fix: consider only submitted ledger entries * fix: delete duplicate leaves from the ledger * fix: check if duplicate ledger entry exists * chore: formatting changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-15 11:55:42 +05:30
rohitwaghchaure	c649468f37	Fixed typo	2020-05-15 11:35:41 +05:30
rohitwaghchaure	b8011197d9	Merge branch 'develop' into quoted-item-report	2020-05-15 04:54:40 +05:30
Saqib	41b47a68b3	fix: item price not fetching when customer is unset in item price (#21488 ) * fix: item price not fetching when customer is unset in item price * fix: item price of selling type has hidden supplier value * fix: remove test variable * fix: test * patch: invalid customer/supplier based on item price type * fix: invalid query * fix: patch Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-15 04:24:36 +05:30
sahil28297	28c9468dad	fix(patch): use translated string while setting notification template (#21679 )	2020-05-11 19:28:10 +05:30
Nabin Hait	85a89812a4	fix: Run income-tax-slab patch only if slab already exists in payroll period (#21684 )	2020-05-11 19:23:18 +05:30
Marica	8a85b9428b	Merge branch 'develop' into quoted-item-report	2020-05-11 17:56:11 +05:30
Suraj Shetty	d53822f012	Merge pull request #21618 from scmmishra/sync-dashboards	2020-05-09 14:15:20 +05:30
Marica	c1a890a739	Merge branch 'develop' into quoted-item-report	2020-05-07 17:45:32 +05:30
sahil28297	c759e17900	fix(item): patch to rename duplicate item_code values to name (#21622 ) Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>	2020-05-07 12:12:13 +05:30
Shivam Mishra	b2103f5470	feat: remove old fixtures	2020-05-06 15:18:43 +05:30
Deepesh Garg	3e0c51879e	fix: Set Purchase Receipt and Delivery Note detail patch (#21607 ) * fix: Set Purchase Receipt and Delievry Note detail patch * fix: Reload purchase receipt item	2020-05-06 10:46:13 +05:30
Nabin Hait	07fe4e1933	Update add_default_dashboards.py	2020-05-05 18:27:13 +05:30
Rucha Mahabal	98229db3ae	feat: Default Dashboard for Healthcare Workspace (#21414 ) * feat: Default Dashboard for Healthcare Workspace * fix: patch * Update add_healthcare_dashboard.py * fix: failing patch test Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-05-05 16:02:16 +05:30
Nabin Hait	672b74d89c	fix: Patch and tests	2020-05-05 15:58:52 +05:30
Nabin Hait	9be11455a5	Merge branch 'develop' into refactor-addiional-salary	2020-05-05 14:43:07 +05:30
Marica	5e3d8050aa	fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724 ) * fix: Handle rows with same item code from Purchase Receipt to Invoice. * fix: Added patch, fixed tests, fixed delivery note behaviour * chore: Added comments amd fixed typo * fix: Added patch to patches.txt * fix: Patch fix and simplification, json timestamp updation. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-05 14:37:39 +05:30
sahil28297	232396494b	fix(patch): reload GSTR 3B report	2020-05-04 19:20:55 +05:30
Anurag Mishra	09572d9892	patch: to link additional salary with salary slip and leave encashment, incentive with additional salary	2020-05-04 17:07:15 +05:30
Mangesh-Khairnar	2f7861a9b8	feat: Process deferred accounting entry (#19658 ) * feat: process deferred accounting * feat: maintain entry for deferred accounting * feat: add check for automatic deferred accounting entry * feat: add build conditions for company and account * fix: create record for automatic processing of deferred accounting * feat: add custom naming series * fix: change the deferred revenue creation via hooks * fix: add client side validations * test: creation of gl entries on submission of process deferred accounting * fix: add multiple validations * patch(accounts-settings): set automatically process deferred accounting entry * fix: On cancel function for deferred entry * fix: Send email per process instead of per invoice * fix: Test cases * fix: Label * fix: Process deferred accounting fixes * fix: Error flag Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-05-02 20:09:33 +05:30
Deepesh Garg	1a1b06cf59	Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix fix: Travis (develop)	2020-05-01 14:17:46 +05:30
Deepesh Garg	032814b86a	fix: Patch test	2020-05-01 13:26:26 +05:30
rohitwaghchaure	260bf54c99	Merge pull request #21171 from nextchamp-saqib/rename-bank-reco chore: rename bank reconciliation to bank clearance	2020-05-01 09:33:52 +05:30
Rucha Mahabal	f65fb1fcf8	fix: Move Video Doctype from Education module to Core (#21234 ) * fix: move Video Doctype from Education module to Core * fix: patch to retain Permissions Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-04-30 19:47:18 +05:30
Deepesh Garg	2a9c5badc6	feat: Immutable ledger (#18740 ) * fix: Reverse GL entry on cancellation of document * fix: Removed set posting time field for multiple docs * fix: Stop future reposting and reverse entry for purchase receipt and delivery note * fix: Change is_cancelled field from select to check * Revert "fix: Removed set posting time field for multiple docs" This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8. * fix: Multiple fixes in GL Entry * fix: Remove future reporting from doctypes * fix: Canceled entry filters in Stock Ledger and General Ledger Report * fix: Remove print statement * fix: Validation for back dated entries * fix: Codacy fixes * fix: Add ignore links to multiple doctypes * fix: Codacy Fixes * fix: Ignore GL Entry and Stock Ledger entry while cancel * fix: Test case fixes * fix: Patch * fix: Codacy * fix: Budget Test Cases * fix: Patch * fix: Patch * fix: Multiple test cases * fix: changes in make_reverse_entry function * fix: Update patch * fix: Test Cases * fix: Test Case fixes * fix: Move patch upward in patches.txt * fix: Budget Test Cases * fix: Test Case and codacy * fix: Patch * fix: Minor label and UX fixes * fix: Move freezing date check * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Test Case * fix: Remove update_gl_entries_after function * fix: Remove update_gl_entries_after function * fix: Test Cases * fix: Fiscal Year wise backdated entry * fix: Update entries only for current SLE * fix: Remove is_cancelled * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Uncomment account and stock balance sync logic * fix: Stock balance and Account balance out of sync fixes * fix: Test Cases * fix: Test cases for POS, Stock Reco and Purchase Receipt * fix: Stock Reco tests * fix: Test stock reco precision * fix: Test stock reco for fifo precision * fix: Test stock reco for fifo precision * fix: Stock Entry test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-30 10:38:58 +05:30
Nabin Hait	504a5f3a3a	fix: reload income_tax_slab_other_charges in patch (#21447 ) * fix: reload income_tax_slab_other_charges in patch * fix: reload lower_deduction_certificate in patch	2020-04-28 11:16:04 +05:30
Rucha Mahabal	7bbe3dd8a0	fix: Patch for updating Appointment Reminder method in Scheduled Job Type (#21431 )	2020-04-27 10:51:46 +05:30
rohitwaghchaure	4d754eadc8	Merge branch 'develop' into quo-status-fix	2020-04-27 00:22:43 +05:30
Nabin Hait	ba70e7e8bc	Payroll based on attendance (#21258 ) * feat: Payroll based on attendance and leave * test: salary slip based 0n attendance * feat: Payroll based on attendance * fix: Codacy issues Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>	2020-04-26 20:17:48 +05:30
Deepesh Garg	d78cf97250	feat: Allow tax withholding category selection at invoice level (#20870 ) * feat: Allow tax withholding category selection at invoice level * fix: Linitng fixes * feat: TDS calculation using common PAN * fix: Add provision to deduct Lower TDS in purchase invoice * fix: Consider only ref docs company while computing TDS * fix: Default permission fixes * fix: Add validation for dates in fiscal year * fix: Undefined variable	2020-04-26 20:08:52 +05:30
Nabin Hait	58ee6c1e08	feat: Income tax slab (#21399 ) * Feat: Multiple tax as per new taxation rule * patch:for multiple tax slab, fix: payroll and exemption validation * Test: Fixture * feat: income tax slab with other charges and tax exempted deduction components * fix: added missing init file * fix: Patch fixed * fix: Patch fixed * fix: test fixes * fix: validate duplicate exemption declaration * fix: payment entry test case Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>	2020-04-26 17:45:57 +05:30
Saqib Ansari	2fea073539	fix: query logic	2020-04-26 17:30:23 +05:30
Saqib Ansari	22d2970339	fix: query	2020-04-24 13:47:44 +05:30
Saqib Ansari	0f2c64cfef	fix: travis	2020-04-23 19:19:09 +05:30
Rucha Mahabal	78d7ed521f	Merge branch 'develop' into email-camp-end-date	2020-04-23 16:00:27 +05:30
Saqib	63084c6292	Merge branch 'develop' into quo-status-fix	2020-04-23 15:30:31 +05:30
Anupam K	0f7bac26e6	setting end date in email campaign	2020-04-23 15:29:12 +05:30
Saqib Ansari	1e4c28e99d	fix: quotation have expired status even if sales order exists	2020-04-23 15:28:47 +05:30
Anupam K	39911b40f0	setting end date in email campaign	2020-04-23 14:14:49 +05:30
Deepesh Garg	b1e68bd022	fix: Rename bank account type doctypes (#21179 ) * fix: Rename bank account type doctypes Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-23 12:19:30 +05:30
rohitwaghchaure	6fa6caf46c	fix: patch and validation message to fix target warehouse issue (#21371 )	2020-04-23 09:46:29 +05:30
Sahil Khan	f03efdc6b1	fix(patch): reload 'Import Supplier Invoice' doc	2020-04-20 14:18:28 +05:30
Saqib	b61d2411b1	Merge branch 'develop' into rename-bank-reco	2020-04-20 12:21:22 +05:30
Saqib Ansari	9de76de621	fix: patch	2020-04-20 12:19:27 +05:30
marination	8890b6044d	fix: Patch fix, Travis fix and cleanup - Added UOM column in Report - Removed mandatory on `valid_till` - Added list view indicator for Expired status in Supplier Quotation - Sorted Labels in Chart and syntax cleanup - Made labels Translatable - Fixed patch	2020-04-15 12:31:12 +05:30
marination	1bab1539b1	Merge branch 'develop' of https://github.com/frappe/erpnext into quoted-item-report	2020-04-15 12:16:31 +05:30
Rucha Mahabal	11121f4905	fix: patch for Healthcare Refactoring	2020-04-15 11:53:39 +05:30
marination	8179804405	refactor: Quoted Item Comparison Report - Refactored Report View - Added Chart - Added 'valid_till' date in Supplier Quotation - Added patch to set valid_till and daily job to set expiry status	2020-04-14 23:05:11 +05:30
Deepesh Garg	78c0841d64	Merge pull request #21249 from Thunderbottom/blanket-order-patch-fix chore: force reload doctype before running patch	2020-04-13 18:59:31 +05:30
Rucha Mahabal	79bc819f92	fix: Healthcare Patch	2020-04-13 18:51:04 +05:30
Chinmay D. Pai	de8554d0dc	chore: force reload doctype before running patch fixes Unknown column 'against_blanket_order' in 'field list' Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-04-13 16:03:22 +05:30
Rucha Mahabal	41520f9fca	Merge branch 'develop' into healthcare_refactor	2020-04-09 19:16:31 +05:30
Mangesh-Khairnar	49816b0c5f	fix(MWS): add new regions to marketplace (#21196 ) * fix(MWS): add marketplace region for uae * fix: rename the fields for mws integrations Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 12:57:14 +05:30
rohitwaghchaure	47c8ddb29b	Merge pull request #20962 from marination/pick-list-enhance fix: Pick List Enhancements	2020-04-08 12:09:10 +05:30
Raffael Meyer	385a92d3f2	fix(patch): set_task_status (#21130 ) * fix(patch): set_task_status * remove unnecessary loop, use tabs Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 09:24:34 +05:30
Nabin Hait	b95a794e51	Merge branch 'develop' into healthcare_refactor	2020-04-08 09:08:21 +05:30
Raffael Meyer	9aae0c27c2	feat(regional): a central place for regional address templates (#19862 ) * feat: a central place for regional address templates * set up address templates during install * why don't the tests run? * fix: remove unused variables, fix cwd * fix: .get() dicts contents * fix: choose the right default * fix: fieldname is template, not html * fix: import unittest * fix: remove unnecessary code * fix: ensure country exists * fix: ensure country exists * feat: test updating an existing template * fix(regional): DuplicateEntryError in test_update_address_template * refactor and set 'is_default' * fix codacy * fix: patch gst_fixes * fix: patch update_address_template_for_india Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 08:56:57 +05:30
rohitwaghchaure	36459c052f	Merge branch 'develop' into pick-list-enhance	2020-04-07 18:04:39 +05:30
Nabin Hait	c9f08bed2b	fix: set batch qty in batch master and test cases	2020-04-07 17:33:10 +05:30
Rohan Bansal	40611080da	fix(patch): Fix edge cases for Batch	2020-04-07 17:33:10 +05:30
Rohan Bansal	56827a372c	fix(patch): Reload Batch doctype before update query	2020-04-07 17:33:10 +05:30
Rohan Bansal	658ed14e40	feat(batch): Add total quantity and dashboard to Batch	2020-04-07 17:33:10 +05:30
Rucha Mahabal	9d0ff961bc	fix: patch and tests	2020-04-07 16:43:22 +05:30
Rucha Mahabal	21f5680914	fix: merge conflicts	2020-04-07 16:42:50 +05:30
rohitwaghchaure	d313a239de	Merge pull request #21065 from marination/bin-requested-qty fix: Updated Bin Requested Qty logic	2020-04-07 14:50:19 +05:30
Marica	048de30cb5	Merge branch 'develop' into pick-list-enhance	2020-04-07 14:05:05 +05:30
marination	39f9dd03a7	fix: Use reload_doc in patch	2020-04-07 14:03:50 +05:30
Rucha Mahabal	0f23a304bc	fix: added patch for refactored changes	2020-04-06 19:00:17 +05:30
Saqib Ansari	b2a84fe478	chore: rename bank reconciliation to bank clearance	2020-04-06 16:32:33 +05:30
marination	642f19d704	fix: Patch fix	2020-04-06 16:01:50 +05:30
Marica	e58d1b1b9f	Merge branch 'develop' into bin-requested-qty	2020-04-06 15:54:51 +05:30
Deepesh Garg	8853850fd8	Merge branch 'develop' into item_tax_template_fix	2020-04-06 13:13:37 +05:30
Deepesh Garg	6c8efdef09	fix: User permissions in GSTR 3B report	2020-04-04 20:05:17 +05:30
Marica	66c4a08703	fix: Update Received Qty in Material Request as per Stock UOM (#21054 ) * fix: Update Received Qty in Material Request as per Stock UOM * fix: Process each PR only once * fix: minor suggested changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 10:07:06 +05:30
Deepesh Garg	007548b79c	fix: Bank Account patch (#21124 )	2020-03-31 10:07:51 +05:30
marination	815c36a4eb	fix: Updated Bin Requested Qty logic	2020-03-26 15:46:27 +05:30
Deepesh Garg	bdcfab3a0f	fix: Update patch and bank form cleanup	2020-03-25 21:32:10 +05:30
marination	e1f499ae1b	fix: Pick List Enhancements	2020-03-17 11:47:11 +05:30
Deepesh Garg	0b7acc0fd6	fix: Create Item tax template only for specific account types	2020-03-13 11:51:14 +05:30
Nabin Hait	2bd6ac56c6	Merge branch 'develop' into develop	2020-02-26 13:21:38 +05:30
Deepesh Garg	d1d0a50a70	feat: Loan management and accounting (#19035 ) * fix: Create Loan Management module * fix: Move loan doctype for hr module to loan management * fix: Add loan dashboard * fix: Move loan application form hr module to loan management * fix: Move Loan Type from hr to loan management * fix: Move salary slip loan from hr to loan management * fix: Create loan security pledge doctype * fix: Create loan security type doctype * fix: Create Loan security doctype * fix: Add customer in loan_common.js * fix: Import patch for loan * fix: Add security pledging in loan doctype * fix: Add loan application pledge doctype * fix: Add logic for security pledgeing in loan * fix: Add logic for security pledging in loan application * fix: Rename Loan security doctype to Loan Security Pledge * fix: Add doctype for loan security * fix: Fixes in loan and loan application * fix: Add doctypes for loan repayment * fix: Fixes in loan and loan application * fix: Move loan repayment report from HR module to loan management * fix: Create doctype for loan security price * fix: Create doctype for loan security shortfall * fix: Make fields in Loan shortfall readonly * fix: Make loan type submittable * fix: Add daily job for loan security revaluation in hooks.py * fix: Add loan management module * fix: Doctype for loan disbursement Entry * fix: GL entry fix for loan disbursement * fix: Add company currency options in Loan related doctypes * fix: Changes in Loan Doctypes * fix: Allow miltiple loan securities in Loan Security Pledge * fix: Add proposed pledges in Loan Application * fix: Add test cases for loan * fix: Interest Accrual Entry for loans * fix: Remove loan from journal entry * fix: Update triggers in loan_common.js * fix: Accrual Entries for loan Interest * fix: Proposed Pledges for loan application * fix: Update items in loan management module * fix: Allow multiple disbursements against a loan * fix: Add loan security code in loan security master * fix: Allow multiple securities in a single pledge * fix: Spelling and label fixes * fix: Replace date in loan security price with datetime * fix: Add dashboard to loan master * fix: Move Repayment Schedule from HR to Loan Management * fix: Add back jobs for loan accrual entries * fix: Multiple fixes in loan * fix: Multiple fixes in loan application * fix: Loan Reapayment for term loans * fix: Interest Accural Entries for term loans * fix: Changes in Loan Doctypes * fix: Add test case for term loan repayment * fix: Add custom button to update loan security price and trigger shortfall * fix: Usability fixes in Loan management * fix: Multiple usablity and doctype fixes * fix: Muliple bug and usability fixes in loan * fix: Test case fixes for loan repayment from Salary * fix: Codacy fixes * fix: Test Case fixes * fix: Minor fix in validate_repayment_method * fix: Test case and codacy fixes * fix: Provide consistent naming series to loan doctypes * fix: Loan Application fix * fix: Loan Application Dashboard * fix: Add doctypes to process loan interest accural and loan security price * fix: Provision to make loan topup * fix: Pledge and unpledge statuses and doctype for loan securit unpledge * fix: Multiple fixes in Loan Cycle * fix: Add missing dashboards to loan doctypes * fix: Add Loan Manager role to loan doctypes * fix: Loan Process fixes * fix: Loan Security Unpledge fixes * fix: UX, List and dashboards fixes * fix: Minor fixes * fix: Minor fixes * fix: Status on additional loan security * fix: Codacy fixes * fix: Multiple fixes in loan * fix: Rename Process Loan Security Price to Process Loan Security Shortfall * fix: Loan Repayment and Closure report * fix: Loan Security Status report and minor fixes * fix: Multiple UX fixes * fix: Test Case fixes and UX fixes * fix: Currency symbol fixes in Salary Slip Loan * fix: Make loan account details read only * fix: Changes in loan security price updation * fix: Sanctioned Loan Amount doctype * fix: Updates in process loan interest accrual * fix: Pass loan doc instead of loan name * fix: Fixes in process loan interest accrual * fix: Add missing semicolon * fix: Test case * fix: Test case * fix: Sandbox method to get proposed pledges * fix: Sandbox method * fix: Nonetype fix in loan sanction limit * fix: GL entry fixes * fix: Update maximum loan amount on loan security pledging * fix: Round off loan amounts * fix: Loan Security unpledging * fix: Interest amount for loan closure * fix: Due date for loan repayments * fix: API fixes for loan disbursement method * fix: Disable quick entry for sanctioned loan amount * fix: Add misssing translations for validations and codecleanup * fix: Translation fixes and code cleanup * fix: Test Cases * fix: Loan Interest Accrual test case	2020-02-26 10:44:24 +05:30
Deepesh Garg	0a6314ab92	Merge pull request #20659 from deepeshgarg007/plaid_fix_develop fix: Plaid fixes and enhancements	2020-02-18 18:09:01 +05:30
Deepesh Garg	16445305d5	fix: Styling and minor fixes	2020-02-18 18:04:09 +05:30
racitup	f2fb963986	Ignore codacy SQL injection warning (internal code only) and add copyright notice	2020-02-18 17:52:07 +05:30
racitup	719678957a	fix: Bank Reconciliation Bank Account and Bank Account No field names	2020-02-18 17:49:45 +05:30
Deepesh Garg	15ff6a594b	feat: Inter warehouse stock transfer on valuation rate with taxation (#20083 ) * fix: Validation for target warehouse * feat: Get items on valuation rate in delivery note on Internal transfers * fix: Create Inter company purchase receipt from delivery note * feat: Inter company stock transfer on valuation rate with taxation * fix: Add from warehouse in purchase invoice * fix: Use get_value instead of get_cached_value * fix: Get incoming rate instead of valuation rate * fix: GL entry for from warehouse in purchase receipt * fix: GL Entries fixes in purchase invoice * fix: Address and tax fetching fixes * fix: Add test case for stock transfer via purchase receipt * fix: Code cleanup, added validations and test cases * fix: Validation for supplier warehouse * fix: Test Cases * fix: Change validation condition * fix: Address fixes while creating Purchase Receipt from delivery note * fix: Set taxes while creating Purchase Receipt from Delivery Note * fix: Update set_missing_value function Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-18 12:28:41 +05:30
P-Froggy	4cc929cabb	Move SWIFT-number and branch-code from bank account to bank The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.	2020-02-18 00:38:46 +01:00
Rucha Mahabal	cf3c8174f6	Merge branch 'develop' into fix_regional_data	2020-02-10 00:40:21 +05:30
Rucha Mahabal	8334a3a1fd	fix: patch for creating irs_1099 custom field (United States)	2020-02-10 00:34:09 +05:30
sahil28297	32d643ed3c	fix(patch): reload tax category (#20308 )	2020-01-15 18:57:54 +05:30
sahil28297	596a072d5f	fix(patch): do not append taxes to template if account name is not set (#20312 )	2020-01-15 18:56:36 +05:30
Deepesh Garg	2d151a7b85	fix: Remove patch to set automatic tax fetching from item tax template (#20234 )	2020-01-13 15:09:27 +05:30
Suraj Shetty	000ac0068b	Merge branch 'develop' into rename-doc-fix	2020-01-09 13:46:08 +05:30
sahil28297	88737e38f2	fix(item_tax_template): fetch parent account if not set (#20198 )	2020-01-07 11:30:22 +05:30
Rohan	b73b347697	feat: add job applicant's email in job offer (#20153 )	2019-12-31 17:09:02 +05:30
Deepesh Garg	b914cf0a9d	Merge pull request #19815 from Mangesh-Khairnar/publish-item feat(marketplace): allow user to un-publish item	2019-12-28 17:52:49 +05:30
Rohan	901fe4785c	fix: employee preferred email patch (#20116 )	2019-12-27 17:07:35 +05:30
Mangesh-Khairnar	c7ce597b7f	fix: return when Hub Tracked Item is empty	2019-12-27 14:48:14 +05:30
Deepesh Garg	467dba1954	fix: Patch incorrect GST category in invoices (#20084 ) * fix: Patch to set GST category for unregistered invoice * fix: Move patch up in line	2019-12-27 12:58:19 +05:30
Mangesh-Khairnar	cca6fb2794	Merge branch 'develop' into publish-item	2019-12-27 12:55:28 +05:30
rohitwaghchaure	4d806033af	Merge pull request #19335 from PawanMeh/feat_19334 feat(regional): Italian Localization and Passive invoicing cycle	2019-12-27 12:48:46 +05:30
Nabin Hait	8f3fea63b1	Merge branch 'develop' into publish-item	2019-12-27 12:19:02 +05:30
deepeshgarg007	8857d87c5b	fix: Travis	2019-12-26 17:34:02 +05:30
Saqib	7519436260	Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos feat: provision to select the custom fields in the online POS	2019-12-26 13:40:43 +05:30
Rohit Waghchaure	2c13a0533b	code cleanup	2019-12-26 12:14:32 +05:30
hello@openetech.com	7021402a45	[feat] #19334	2019-12-26 12:13:27 +05:30
Rohit Waghchaure	682273a00b	feat: provision to select the custom fields in the online POS	2019-12-26 11:59:19 +05:30
Mangesh-Khairnar	d19bd8f0dd	Merge branch 'develop' into publish-item	2019-12-25 22:10:33 +05:30
Parth J. Kharwar	8c4cf12c93	Setting preferred driver email in delivery trip (#19832 ) * fix: add driver's preferred contact email in delivery trip * fix: modify driver's preferred email patch and blank field checks * fix: patch file fix * fix: patch changes to improve speed * fix: removal of conflicts Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-25 15:14:52 +05:30
Mangesh-Khairnar	0143f7c59d	patch: set published in hub track item	2019-12-24 17:45:57 +05:30
Rohan	ff98a52834	Merge branch 'develop' into v12-lead-address-contact	2019-12-24 11:21:08 +05:30
Rohit Waghchaure	0dba4345f3	fix: patch	2019-12-20 17:04:39 +05:30
Gavin D'souza	1e4ea466d3	style: update/standardize rename_doc usage	2019-12-19 19:07:29 +05:30
deepeshgarg007	94ff8058ac	fix: Add missing import	2019-12-14 21:25:30 +05:30
Deepesh Garg	6e2c13f4c8	feat(regional): Auto state wise taxation for GST India (#19469 ) * feat(regional): Auto state wise taxation for GST India * fix: Update gst category on addition of GSTIN * fix: Codacy and travis fixes * fix: Travis * fix(test): Update GST category only if GSTIN field available * fix: Test Cases * fix: Do not skip accounts if place of supply is not present * fix: Auto GST taxation for SEZ Party types * fix: Automatic taxation for multi state * fix: Codacy and travis fixes * fix: Auto GST template selection in Sales Order * fix: Move inter state check and source state to tax category * fix: Remove unique check from tax template * fix: Remove unique check from tax template * fix: Address fetching logic in Sales * fix: fecth tax template on company address change * fix: fetch company gstin on address change * fix: company_gstin set value fix * fix: Mutiple fixes and code refactor * fix: Add missing semicolon * fix: Company address fetching in sales invoice * fix: Remove print statement * fix: Import functools * fix: Naming fixes and code cleanup * fix: Iteritems compatibility for python 3	2019-12-10 15:55:05 +05:30
Nabin Hait	6f68f2d020	feat: Cost center for each expenses in expense claim and allowed deferred expense (#19807 ) * refactor: Expense Claim Cost Center * refactor: Expense Claim Cost Center * refactor: Expense Claim Cost Center * fix: copy cost center from other row * patch: set cost center in children based on parent * fix: test cases for expense claim	2019-12-10 08:40:10 +05:30
Nabin Hait	da4847e46d	patch: Set against_blanket_order value in existing SO/PO (#19810 ) * patch: Set against_blanket_order value in existing SO/PO * Update set_against_blanket_order_in_sales_and_purchase_order.py	2019-12-09 18:27:50 +05:30
Rohan	05222270e1	Merge branch 'develop' into v12-lead-address-contact	2019-12-06 14:25:30 +05:30
sahil28297	eb9c3e1c5b	fix(patch): set proper tax_type and proper account (#19794 )	2019-12-04 12:01:31 +05:30
rohitwaghchaure	ce32f9a361	Merge branch 'develop' into capacity_planning_for_workstataion_feature	2019-12-02 11:29:06 +05:30
Rohit Waghchaure	8b599f2bc9	fix: capacity planning back	2019-11-29 14:09:30 +05:30
Rohan Bansal	69e3868a9d	patch: set title for old leads	2019-11-28 12:23:19 +05:30
Rucha Mahabal	58928e8eae	Merge branch 'develop' into setup_wizard	2019-11-27 11:55:53 +05:30
Rucha Mahabal	195893db0e	fix: conditionally run old patch for Setup Progress	2019-11-26 15:22:05 +05:30

... 8 9 10 11 12 ...

3354 Commits