Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,642 Commits 3 Branches 0 Tags 1 GiB
471f48f64d
Commit Graph

2155 Commits

Author SHA1 Message Date
Deepesh Garg
83f98f6992
Merge pull request #25653 from deepeshgarg007/tax_labels 
fix: Client script breaking while settings tax labels
 2021-05-10 18:24:02 +05:30
Deepesh Garg
9f0823a164 fix: Linting issues 2021-05-10 16:07:41 +05:30
Saqib
55d47a2baa
fix(pos): UI fixes related to overflowing payment section (#25652) 
* fix: additional fields overflowing in payment section

* fix: pos profile filter in pos opening dialog

* fix: item quantity pill
 2021-05-10 15:59:37 +05:30
Deepesh Garg
13dfb9734c fix: Lable for transaction child tables 2021-05-10 15:38:32 +05:30
Deepesh Garg
1a48eb49cf fix: Client script breaking while settings tax labels 2021-05-10 14:37:10 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button (#25413) 
* feat!: add pick batch button

BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* style: add sider review changes

* refactor: make consice, extract function

* refactor: camel to snake casing
 2021-05-07 20:30:04 +05:30
Faris Ansari
f97cc0367b fix: initialize filters in constructor 2021-05-07 15:32:06 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447 fix: Update bundle paths 2021-05-07 14:53:42 +05:30
Faris Ansari
ff3b71d2e7 fix: Make css bundles 2021-05-07 14:52:13 +05:30
Faris Ansari
f751738267 fix: Make js bundles 2021-05-07 14:51:05 +05:30
Nabin Hait
7481f54e0c Merge branch 'version-13' into develop 2021-05-06 19:18:18 +05:30
Deepesh Garg
daf6c124a9 fix: Check if payment schedule exists 2021-05-06 16:47:02 +05:30
Deepesh Garg
be66ee9723 fix: Check if payment schedule exits before updating label 2021-05-06 16:46:55 +05:30
Deepesh Garg
a0ed517c85 fix: function call to update payment schedule labels 2021-05-06 16:46:47 +05:30
Deepesh Garg
ffea9d4126 fix: Check if payment schedule exists 2021-05-05 12:28:40 +05:30
Deepesh Garg
1bb7bb74ad fix: Check if payment schedule exits before updating label 2021-05-05 12:19:57 +05:30
Deepesh Garg
04923d6a65 fix: function call to update payment schedule labels 2021-05-04 21:01:12 +05:30
Saqib
cdc99cdd49
fix(pos): incorrect expense account set in pos invoice (#25543) 2021-05-03 11:54:55 +05:30
Deepesh Garg
0ae702aab9 Merge branch 'develop' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-02 22:37:04 +05:30
Deepesh Garg
f6610c96dd fix: Gracefully handle duplicate bank account name to make setup faster 2021-05-02 12:23:11 +05:30
Saqib Ansari
3e83542360 fix: sider issues 2021-04-29 18:12:47 +05:30
Saqib Ansari
973afeac3c feat: set dynamic labels for payment schedule fields 2021-04-29 18:12:27 +05:30
Saqib Ansari
a91eebf6aa feat: base payment amount in payment schedule 2021-04-29 18:12:23 +05:30
Saqib Ansari
6fb417590f fix: sider issues 2021-04-29 14:05:20 +05:30
Saqib Ansari
c5c9f9a941 feat: set dynamic labels for payment schedule fields 2021-04-23 15:34:58 +05:30
Saqib Ansari
d552fe6778 feat: base payment amount in payment schedule 2021-04-23 14:46:52 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Alan
157b388209
fix: change subcontracted item display (#25425) 2021-04-21 21:00:22 +05:30
Marica
e8bc912ffc
perf: Fetching exchange rate on every line item slows down PO (#25345) 
* fix: Dont fetch exchange rates for each line item once fetched at parent
`

* perf: Use price list conversion rate from parent

- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-19 11:05:21 +05:30
Jannat Patel
dcdd3bebbe
feat: Timer in LMS Quiz (#24246) 
* feat: new fields in quiz doctypes

* feat: timer in lms quiz

* fix: variable initialisation

* fix: context, exception fix

* fix:sider

* fix:sider

* fix: indentation

* fix: timer

* fix: sider

* fix: return value and format

* fix: show time taken only after all attempts are over

* fix: sider

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-19 10:36:40 +05:30
rohitwaghchaure
72929aab38
Merge pull request #24878 from anupamvs/planning 
feat: add total available stock field in PO
 2021-04-15 16:28:49 +05:30
Sun Howwrongbum
c50fbc6897
fix: list lookup with undefined variable (#25210) 
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-04-15 14:52:13 +05:30
Anupam Kumar
ee0dda6ba5
Merge branch 'develop' into planning 2021-04-15 12:48:25 +05:30
Marica
4e25aa77dd
Merge branch 'develop' into dev-quality-inspection-accounts 2021-04-14 19:06:14 +05:30
Marica
f045fde9f4
Merge branch 'develop' into patch-8 2021-04-14 18:56:15 +05:30
Marica
24e45163d5
fix: Sider 2021-04-14 18:53:15 +05:30
Rohan Bansal
03f711e3a2 style: sider issues 2021-04-14 14:41:55 +05:30
Rohan Bansal
7f8b95efe8 fix: move QI logic to stock module 2021-04-14 14:15:45 +05:30
Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount (#25188) 
* fix: Round off final tax amount instead of current tax amount

* fix: Syntax error

* fix: Indentation

* fix: Round Off taxes order execution

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-14 11:20:27 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Marica
1f9d231acf
Merge branch 'develop' into patch-8 2021-04-13 15:43:46 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Andy Zhu
bffe933c22
Fix: attempts to add overrides function 
Overrides parent_fieldname in outer form to all child rows's fieldname
 2021-04-12 22:49:26 +12:00
Anupam Kumar
cd2aedd0c6
Merge branch 'develop' into planning 2021-04-09 17:59:47 +05:30
Jannat Patel
d9fa79de99
fix: serial no refresh issue (#25127) 
* fix: serial no refresh issue

* fix: sider
 2021-04-08 16:04:57 +05:30
Anupam Kumar
dfdf72cbb2
Merge branch 'develop' into planning 2021-04-08 10:58:05 +05:30
Rohan Bansal
a93b514b2f feat: create Quality Inspections from account and stock documents 2021-04-06 17:20:16 +05:30
Anupam Kumar
1033cf72f6
fix: added flag for dont_fetch_price_list_rate in transaction (#25041) 2021-03-31 19:39:45 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule 
feat: recursive pricing rule
 2021-03-26 19:10:10 +05:30
Prssanna Desai
3da2df55f4
Merge branch 'develop' into help-links-fix 2021-03-26 15:35:17 +05:30
prssanna
dd2a315d06 style: fix formatting 2021-03-26 14:35:47 +05:30
prssanna
97aab3ac21 fix: missing help links in navbar help dropdown 2021-03-24 16:44:49 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning 2021-03-24 15:12:04 +05:30
Jannat Patel
12f0923a61
fix: serial no trim issue (#24949) 
* fix: serial no trim issue

* fix: valid serial nos

* fix: sider

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-03-23 21:09:49 +05:30
Anupam
4980dd616b fix: resolving commits 2021-03-22 11:23:47 +05:30
Rohit Waghchaure
77add49c6a fix: don't club same free item 2021-03-17 18:49:54 +05:30
Rohit Waghchaure
a9b1347600 fix: nonetype object has no attribute options 2021-03-17 14:30:34 +05:30
Rohit Waghchaure
ff70e61d7a feat: recursive product discount 2021-03-17 14:30:34 +05:30
Andy Zhu
6117ac5aff
fix: copy_parent_value_in_all_row function error 2021-03-17 13:53:02 +13:00
Anupam Kumar
ed42afc5e8
feat: price margin in buying (#24685) 2021-03-15 11:11:28 +05:30
Marica
63eb6bdb3c
Merge pull request #24643 from CaseSolvedUK/sinvfix-v13 
fix: Don't throw exception on invoice lines when there is no item_code
 2021-03-11 10:47:24 +05:30
casesolved-co-uk
a780306ec7 fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640) 2021-03-10 15:50:45 +00:00
Sagar Vora
78777d6ed4
fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From (#24756) 
Co-authored-by: walstanb <walstanb@gmail.com>
 2021-03-09 20:35:08 +05:30
Shariq Ansari
261c42186f
fix: updating phone icon setup logic for readonly fields (#24787) 
* fix: updating phone icon setup logic for readonly fields

* fix: sider fix
 2021-03-09 20:28:00 +05:30
Afshan
d95b59e90c fix: call function when arguments available 2021-03-08 18:19:53 +05:30
Afshan
84184559bc
fix: currency symbol in update items (#24726) 2021-02-24 16:51:11 +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
Shariq Ansari
8676bedd18
fix: Add phone icon on read only phone fields (#24680) 
* fix: Add phone icon on read only phone fields

* fix: sider fix
 2021-02-22 19:28:01 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes (#24488) 
* feat: Normal rounding for GST Taxes

* fix: Add test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-19 14:30:23 +05:30
prssanna
7166b6740f fix: duplicate css property 2021-02-16 16:17:17 +05:30
prssanna
7e8113c7e8 fix: broken image style 2021-02-16 12:00:35 +05:30
Rushabh Mehta
8cc6a2d62c fix(typo): erpnext-logo.png 2021-02-15 17:40:50 +05:30
Rushabh Mehta
b0735732f9 fix(minor): add erpnext-logo.png 2021-02-15 17:38:55 +05:30
Rucha Mahabal
ad1f2b41f4 fix: Issues with packing items 2021-02-12 11:29:24 +05:30
Anupam Kumar
7e1dcf911d
feat: capture Rate of stock UOM in purchase (#24315) 
* feat: capture Rate of stock UOM in purchase

* fix: review changes

* added server side code

* added stock uom rate in sales transactions

* fix: review changes

* fix: resolving conflicts

* adding patch

* fix: removing patch
 2021-02-11 20:19:30 +05:30
Afshan
ee87484134
fix: calculated discount percentage (#24510) 
* fix: calculated discount percentage

* fix: slider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 20:11:58 +05:30
Suraj Shetty
5f27c9e100 chore: Remove unnecessary image files 2021-02-10 15:48:58 +05:30
Suraj Shetty
6fa44fefc3 fix: Use new favicon 2021-02-10 15:48:32 +05:30
Suraj Shetty
1016ff48fc fix: Create new call popup if call popup does not exists 2021-02-09 12:17:29 +05:30
Suraj Shetty
dcc9947d10 fix: Update call_popup 
- Setup missed & call ended listeners
- Show contacts based on links
 2021-02-08 20:13:23 +05:30
Suraj Shetty
c5248b30eb fix: Do not re-use call popup if call ID is different 2021-02-08 18:50:05 +05:30
Suraj Shetty
723e6dd73f fix: Update style of call log shown in timeline 2021-02-08 18:43:26 +05:30
Suraj Shetty
c4d67c2afe refactor: Move call_popup style from less to scss 
- Add style for audio
 2021-02-08 18:42:27 +05:30
prssanna
62442d1c52 style: fix formatting 2021-02-01 20:26:09 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +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
leela
3234df5581 feat: improved call log doctype 
* Added links and some more fields into Call Log Doctype
* Display call info in the call log link pages
 2021-01-28 18:34:58 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30
Deepesh Garg
16bcd01f6d
feat: Provision to disable serial no and batch selector (#24398) 
* feat: feat: Provision to disbale serial no and batch selector

* fix: Sider issues

* fix: Linting issues
 2021-01-28 12:09:35 +05:30
Deepesh Garg
bd9bdc5797
feat: Batch wise item pricing (#24470) 
* feat: Batch wise item pricing

* fix: Rate for items with no batch

* fix: Add test case for batch pricing

* fix: Sider Issues

* fix: Add item filter for batch
 2021-01-28 12:05:57 +05:30
prssanna
2d1d900c88 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-27 10:58:17 +05:30
prssanna
72053cc4ab fix: cart address overflow 2021-01-27 10:57:34 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
prssanna
9f1a156307 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 13:04:58 +05:30
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +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
Marica
6ac51edc56
Merge branch 'develop' into putaway 2021-01-18 17:47:25 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Rushabh Mehta
f8a6dde8d8 fix(minor): routing 2021-01-08 14:37:38 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 2021-01-05 13:53:51 +05:30
Marica
41ea77ce31
Merge branch 'develop' into putaway 2021-01-05 11:24:05 +05:30
Deepesh Garg
a873ae0d9f fix: Check for custom dimensions 2021-01-04 14:23:31 +05:30
Deepesh Garg
23ab5c5cc0 fix: Multiplle sider issues 2020-12-31 11:29:06 +05:30
Shivam Mishra
45a56288bb feat: style adjustments to product page 2020-12-30 15:51:50 +05:30
Shivam Mishra
31a651365d feat: update item group website slider 2020-12-30 15:51:34 +05:30
Shivam Mishra
134f6b1b6c chore: update style rules 2020-12-29 17:16:08 +05:30
Deepesh Garg
4a8c2c4cb5 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-29 15:10:36 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing" 2020-12-28 15:29:30 +05:30
Deepesh Garg
d3814b2676 Merge branch develop into batch-wise-pricing 2020-12-28 10:48:29 +05:30
Shivam Mishra
bba2726333 fix: minor styling fixes 2020-12-24 14:14:17 +05:30
prssanna
eb0e596d43 feat: store home page and product page 2020-12-24 11:40:33 +05:30
Rushabh Mehta
ab1c2b7631 fix(minor): routing 2020-12-23 23:26:58 +05:30
Shivam Mishra
46bc7ca69f feat: use call icon 2020-12-22 12:32:36 +05:30
Rushabh Mehta
2cd41bca06 fix(routes): desk to app 2020-12-18 13:17:58 +05:30
Your Name
3ebe511eb9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-16 08:19:47 +00:00
Leela vadlamudi
29778e2fba
feat: Voice Call Settings doctype added (#24126) 2020-12-15 21:23:17 +05:30
Saqib Ansari
d050816e17 fix: overflow of customer selector 2020-12-15 12:02:26 +05:30
Marica
406af27b9e
Merge branch 'develop' into putaway 2020-12-14 13:07:50 +05:30
marination
c47d38dc18 chore: Stock Entry Tests and fixes 
- Maintain item-warehouse wise rules for Stock Entry Material Transfer
- Test cases for Stock Entry with more use cases
- Sider fixes
 2020-12-14 12:12:49 +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
f17ea2ccab
fix: Accounting for internal transfer invoices within same company (#24021) 
* fix: Accounting for internal transfer invoices within same company

* fix: warehouse fetching

* fix: Linting issues

* fix: GL entry fixes and validation for intercompany account

* fix: Account naming changes and other fixes

* fix: Add test for internal transfer

* fix: Test Case

* fix: Add description for fields

* fix: Commonfied code

* fix: Map warehouse and serial no
 2020-12-11 21:30:39 +05:30
Suraj Shetty
dc13d4b0fc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-11 12:57:04 +05:30
Marica
3bc69e59ec
Merge branch 'develop' into update-barcode-if-scan-barcode-used 2020-12-10 18:05:00 +05:30
Mohammad Hasnain Mohsin Rajan
8abe7b91fe
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin Rajan
ce1ca28296
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:05 +05:30
Rushabh Mehta
39154e5296 fix(minor): add debounce to calls 2020-12-10 12:37:16 +05:30
marination
a5d8d32775 chore: Test and fixes 
- Tests as per new design flow
- Fixed duplicate data bug in Warehouse Capacity Summary
- Set Amount currently on applying rule in client side
- Apply rules on server side before validate
 2020-12-09 16:27:18 +05:30
Deepesh Garg
bc0a2859e4 fix: Rate for items with no batch 2020-12-09 12:40:09 +05:30
Mohammad Hasnain Mohsin Rajan
deaf2e80cb
fix: linting 2020-12-09 12:36:14 +05:30
Mohammad Hasnain
69514c4761 fix: scan barcode does not update barcode item field in sales order 2020-12-09 12:10:28 +05:30
Deepesh Garg
91e1136d2c feat: Batch wise item pricing 2020-12-08 22:53:03 +05:30
marination
0f3cfc502b feat: Trigger rule application from client side 
- Table is reset and overwritten with applied rules on checkbox trigger
- Sider fixes
 2020-12-08 19:44:29 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Marica
0b68243979
Merge branch 'develop' into putaway 2020-12-08 11:44:00 +05:30
marination
fac4035f23 feat: Apply Putaway Rules within transaction itself 
- Added checkbox 'Apply Putaway Rule' in PR and SE
- Added link to rule in child tables
- Rule is applied on Save
- Validation for over receipt
- Apply Rule on Stock Entry as well for Material Transfer and Receipt
 2020-12-07 21:35:49 +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
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr 2020-12-04 16:30:40 +05:30
Deepesh Garg
7b2d518059 fix: Dimension filters in accounting reports 2020-12-04 11:28:26 +05:30
Saqib Ansari
a6a37b7c81 fix: scroll elements 2020-12-03 19:24:07 +05:30
Deepesh Garg
12b45b3f2a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-02 12:46:23 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module (#24032) 2020-12-01 13:04:53 +05:30
Saqib Ansari
02d1491e39 fix: order summary qty alignment 2020-11-30 17:42:51 +05:30
marination
1087d97c03 feat: Warehouse Capacity Summary 
- Added Page Warehouse Capacity Summary
- Added Page to Desk and Putaway List View
- Reused Item Dashboard/Stock Balance page render code
- Added naming series to Putaway Rule
 2020-11-26 10:45:44 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return 2020-11-25 17:24:03 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings (#24004) 
* fix: translation strings

* fix: linting
 2020-11-25 15:37:54 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates (#23998) 
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
 2020-11-25 15:36:41 +05:30
Deepesh Garg
1a4390de44 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e fix: Move filter setup to doctype controllers 2020-11-25 14:49:10 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return 2020-11-25 10:43:55 +05:30