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
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
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
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
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
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
