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

21400 Commits

Author SHA1 Message Date
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
Prssanna Desai
e71153cbee
fix: fix options of currency fieldtype in Expense Taxes and Charges (#20901) 2020-03-16 15:52:25 +05:30
Raffael Meyer
1433436670
fix(accounts): add account_type and tax_rate to some VAT accounts (#20940) 
* Add account_type and tax rate to some VAT accounts

* fix indentation
 2020-03-16 15:45:05 +05:30
Shivam Mishra
c06ba54f1e
refactor: remove website (#20927) 2020-03-12 18:04:42 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card 2020-03-12 17:13:03 +05:30
Shivam Mishra
f241054c6c feat: extended settings page 2020-03-12 16:38:59 +05:30
Shivam Mishra
05d74bbcf9 feat: added loan management page 2020-03-12 16:38:49 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Saqib
6ec4618914
fix: travis (#20903) 2020-03-11 16:04:00 +05:30
Prssanna Desai
4fd61c3f83
fix: parameters un get function for accounts dashboard (#20847) 2020-03-11 12:37:56 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Deepesh Garg
4b20e852ea fix: Get invoice details only if invoice is selected 2020-03-10 10:36:05 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register 
fix: HSN code not visible in GST Itemised Purchase register
 2020-03-10 10:05:31 +05:30
Deepesh Garg
74d4e9e4ea
Merge pull request #20884 from deepeshgarg007/first_row_dimension 
fix: Acccounting Dimension disappearing in first row after refresh
 2020-03-09 22:47:25 +05:30
Deepesh Garg
5e58666091 fix: HSN code not visible in GST Itemised Purchase register 2020-03-09 22:38:41 +05:30
Saqib
f866ed9679
fix: [pos] customer group filter resets on syncing offline invoices (#20873) 2020-03-09 18:30:47 +05:30
Marica
508ad51d9c
fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation (#20858) 2020-03-09 18:13:41 +05:30
Marica
4528badfcf
fix: ModuleNotFoundError on Turkey Company setup (#20853) 2020-03-09 18:07:43 +05:30
Deepesh Garg
8d72b14776 fix: Acccounting Dimension disappearing in first row after refresh 2020-03-09 08:06:07 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom (#20843) 
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
 2020-03-06 11:03:46 +05:30
Marica
fc96c1a2d6
fix: update_child_qty_rate() missing argument (#20838) 2020-03-06 10:57:59 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Chinmay D. Pai
612e58dca8
fix: use ERPNext in welcome email when default company is not set 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-03-05 10:08:43 +05:30
Deepesh Garg
6dc335d898
Merge pull request #20824 from scmmishra/report-options 
feat: update profit and loss for new report summary API
 2020-03-04 16:07:31 +05:30
Deepesh Garg
a75cf35bb7
Merge pull request #20755 from lokesh-indictrans/develop 
fix: user is not able to do 'Set as Lost' for Quotation (#20603)
 2020-03-04 11:56:52 +05:30
Deepesh Garg
6d604a151b
fix: Validation message 2020-03-04 11:55:10 +05:30
Deepesh Garg
a245a3a47f fix: HSN code no visible in GST itemised sales register 2020-03-04 10:23:49 +05:30
Lokesh Waingankar
d398c73bc5 fix: Removed html tags in pop up message (#20603) 2020-03-03 19:07:51 +05:30
Lokesh Waingankar
6795422204 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-03 12:12:56 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Anurag Mishra
cf04b3c680
fix: added standard filters (#20807) 2020-03-02 19:25:01 +05:30
Deepesh Garg
12aa35aa43
fix: Label and UX fixes in AP/AP reports (#20803) 2020-03-02 19:10:29 +05:30
Priyanka Gangar
ca05c83796
fix: fetch sales person name (#20805) 
* fix: fetch sales person name

* Update sales_person.js

Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-02 19:06:06 +05:30
Deepesh Garg
cd96be9993
fix: Excel support and UX fixes for chart of accounts importer (#20703) 
* fix: Excel support and UX fixes for chart of accounts importer

* fix: Linting Errors

* fix: Blank chart preview

* fix: Added template types for download

* fix: Description on template selection

* fix: Linting fixes

* fix: Move logic for download template to dialog
 2020-03-02 18:57:21 +05:30
Deepesh Garg
cc2771baa7
fix: Total amount not displayed in Journal Entry (#20794) 
* fix: Total amount not displayed in Journal Entry

* fix: Update paid_to_received field

* fix: set total amount

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-02 18:09:19 +05:30
Saurabh
19df2ffbd8
[bug][fix]: set status to object instead of variable (#20790) 2020-03-02 17:50:05 +05:30
Lokesh Waingankar
38242bc21f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-02 17:45:59 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Frappe PR Bot
eb2f79b16e
feat: Updated translation (#20784) 2020-03-02 16:52:42 +05:30