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

30600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
96297f73f2
Merge pull request #21025 from deepeshgarg007/dimension_perm 
fix: Remove quick entry from accounting dimensions
 2020-03-22 21:56:34 +05:30
Deepesh Garg
75225316f0 fix: Remove quick entry from accouting dimensions 2020-03-22 21:50:22 +05:30
Deepesh Garg
f8b54bd301
Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop 
fix: stock entry qty must be positive
 2020-03-21 20:46:10 +05:30
Rohan
b7d84725e8 fix: add warehouse check for FG item 2020-03-20 18:49:11 +05:30
Rohan
4464a591ef fix: allow BOM to use same item as raw material 2020-03-20 18:49:08 +05:30
marination
73c8d23a79 fix: UOM fixes in Sales Order,Material Request & Production Plan 2020-03-20 17:52:28 +05:30
sahil28297
4c3679ba8a
fix: develop version as 12.0.0-dev 2020-03-20 15:38:52 +05:30
sahil28297
fcdc2b1815
fix: develop version as 12.0.0.dev 2020-03-20 15:20:28 +05:30
sahil28297
54cbff9e80
fix: develop version as 12.x.x instead of 12.2.0 2020-03-20 14:23:27 +05:30
Deepesh Garg
ef491f92d2
Merge pull request #21011 from surajshetty3416/fix-opportunity-listview 
fix: Add currency in options of Opportunity Amount
 2020-03-20 14:05:04 +05:30
Suraj Shetty
3cf0dc966c fix: Add currency in options of Opportunity Amount 
- To show currect symbol in list view
 2020-03-20 12:51:16 +05:30
Rohit Waghchaure
5e4e2dbd03 fix: stock entry qty must be positive 2020-03-19 14:53:37 +05:30
Rohan
ce90848161 fix: allow target warehouses to be changed for work order stock entries 2020-03-19 13:22:58 +05:30
Deepesh Garg
dbeb77e745
fix: Unable to submit landed cost voucher (#20977) 2020-03-19 11:03:03 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop (#20987) 
* fix: Multiple fixes during pre-release testing

* fix: Merge conflict
 2020-03-19 10:59:32 +05:30
Deepesh Garg
9476170b09
Merge pull request #20994 from rohitwaghchaure/fixed_bom_comparision_issue_develop 
fix: bom comparison issue
 2020-03-19 10:55:14 +05:30
Rohit Waghchaure
d9469137cc fix: bom comparison issue 2020-03-19 10:07:27 +05:30
rohitwaghchaure
e4cd12506c
Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop 
fix: reserved qty for production issue for partial completion of work…
 2020-03-19 09:37:43 +05:30
Deepesh Garg
6b36fae531
Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop 
fix: shortage qty in stock projected qty report
 2020-03-19 09:33:03 +05:30
Rohit Waghchaure
dd13d0a9a9 fix: reserved qty for production issue for partial completion of work order 2020-03-19 09:29:17 +05:30
Rohit Waghchaure
cd2478a527 fix: shortage qty in stock projected qty report 2020-03-19 09:27:53 +05:30
Prssanna Desai
b4909b8fd2
fix: set filters as argument filters if passed (#20975) 2020-03-18 18:23:38 +05:30
Deepesh Garg
9dafc9a3df
Merge pull request #20973 from frappe/add-links-to-readme 
fix: Add feature page links to README.md
 2020-03-18 15:12:11 +05:30
Jai Chavan
319667a1af
fix: Add feature page links to README.md 2020-03-18 15:02:31 +05:30
Marica
508ed1e121
fix: Missing if condition in Customer Default Bank Account Validation. (#20969) 2020-03-18 11:28:04 +05:30
marination
3251dcf672 fix: Added patch to patches.txt 2020-03-18 10:11:23 +05:30
Rucha Mahabal
0eeaad8ce7 fix: create fee validity for new patients only 2020-03-17 20:26:29 +05:30
Rucha Mahabal
2d785b7b09 fix: invoicing logic for appointments 2020-03-17 20:18:16 +05:30
Priyanka Gangar
2602c7ea38
Label changes in account settings develop (#20965) 
* fix: Account setting words switches to US Terminology

* created united_states.js

* Remove Unwanted Spaces

* Remove all changes

* Add spaces between arguments

Co-authored-by: PriyankaGangar <pinka0925@gmail.com>
 2020-03-17 19:39:30 +05:30
Rucha Mahabal
f2574dde37 fix: set fee validity start date and set status as Completed or Pending 2020-03-17 19:28:18 +05:30
Rucha Mahabal
2f2c09bd98 fix: wrong fee validity calculation and payment fields visibility in appointment 2020-03-17 18:10:39 +05:30
Deepesh Garg
745897c354
Merge pull request #20862 from alyf-de/skr04_groups 
fix(accounts): adjust account groups in SKR04
 2020-03-17 17:27:16 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis (#20924) 
* fix: Multiple fixes for travis

* fix: Multiple fixes for travis

* fix: Run dashboard patch if table already exists

* fix: Multiple fixes for travis

* fix: deletion of auto-created batch
 2020-03-17 17:04:18 +05:30
rohitwaghchaure
06dc6a527e
fix: bom replace tool issue (#20842) 2020-03-17 17:01:26 +05:30
Deepesh Garg
ff7bbd2d38
fix: Party Name not visible in statement of accounts (#20913) 
* fix: Party name in Statement Of Accounts

* Update general_ledger.html

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 17:00:06 +05:30
marination
e1f499ae1b fix: Pick List Enhancements 2020-03-17 11:47:11 +05:30
Deepesh Garg
e7aefc1163 fix: Add check to skip PR in supplier master 2020-03-17 11:44:02 +05:30
Deepesh Garg
eeb1922e37 fix: Add check to skip SO and DN in customer master 2020-03-17 11:43:34 +05:30
Marica
b10adbb161
fix: Item alternative must have similar fields as original item (#20796) 
* fix: Item alternative must have similar fields as orignal item

* fix: Using db.get_values and meta instead of get_value and get_doc

* fix: Made code more DRY

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 10:56:59 +05:30
Deepesh Garg
ed0965a572
feat: Nested set filtering for accounting dimension (#20860) 
* feat: Nested set filtering for accounting dimension

* fix: Remove print statement
 2020-03-17 10:53:24 +05:30
Deepesh Garg
d1bc74d650
Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix 
fix: Mode of payment not fetcched in Item wise purchase register
 2020-03-16 22:43:09 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection (#20818) 2020-03-16 22:36:44 +05:30
Deepesh Garg
07116c7922 fix: Mode of payment not fetcched in Item wise purchase register 2020-03-16 22:36:32 +05:30
Frappe PR Bot
b8b5fa6291
feat: Updated translation (#20954) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-03-16 17:59:42 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord (#20886) 
* s_inv has is_pos default set as 1
 2020-03-16 17:51:00 +05:30
Anurag Mishra
c0b1c372a4
fix: local variable 'benefit_amount' referenced before assignment (#20949) 2020-03-16 16:53:03 +05:30
Saqib
de4f6901d6
fix: serial_no_selector showing for non serialized batched item (#20851) 2020-03-16 16:29:10 +05:30
Deepesh Garg
0a74261a94
Merge pull request #20920 from deepeshgarg007/c_form_fix 
fix: Get invoice details only if invoice is selected
 2020-03-16 15:56:32 +05:30
Deepesh Garg
d190cc0198
Merge pull request #20835 from Thunderbottom/welcome-email-fix 
fix: use ERPNext in welcome email when default company is not set
 2020-03-16 15:54:53 +05:30