Nabin Hait
|
093beecd0a
|
minor fix
|
2015-05-26 12:15:39 +05:30 |
|
Rushabh Mehta
|
822fd7747a
|
[email] [website] footer cleanup
|
2015-05-26 12:15:39 +05:30 |
|
Rushabh Mehta
|
f29a618b69
|
[email] [website] footer cleanup
|
2015-05-26 12:15:39 +05:30 |
|
Nabin Hait
|
f3ae85cc9a
|
Merge pull request #3313 from rmehta/material-request-fix
[fix] load taxes_and_charges only if field present
|
2015-05-21 13:22:21 +05:30 |
|
Rushabh Mehta
|
4984bccbc6
|
[fix] load taxes_and_charges only if field present
|
2015-05-21 12:51:07 +05:30 |
|
Rushabh Mehta
|
a27cca97b5
|
[rename] POS Setting > POS Profile #3271
|
2015-05-20 15:43:17 +05:30 |
|
Nabin Hait
|
8252117fe5
|
set tax amount also in base currency after manipulation
|
2015-05-19 16:30:17 +05:30 |
|
Nabin Hait
|
f59d3a4e07
|
conversion rate fixes
|
2015-05-19 16:30:16 +05:30 |
|
Rushabh Mehta
|
5495bc54a5
|
[enhancement] default terms in company, fixes #3231
|
2015-05-19 13:03:01 +05:30 |
|
Pratik Vyas
|
1a84d8ecd2
|
Merge branch 'develop'
|
2015-05-19 12:23:52 +05:30 |
|
Rushabh Mehta
|
4a3c805049
|
[fix] sms settings, fixes #3276
|
2015-05-19 11:10:12 +05:30 |
|
Nabin Hait
|
a6ee8290ce
|
Inclusive tax for deduction and manipulation of tax amount to fix rounding issue
|
2015-05-15 12:02:27 +05:30 |
|
Nabin Hait
|
ffc7f3fef6
|
Apply default taxes on loading of document
|
2015-05-12 15:07:02 +05:30 |
|
Nabin Hait
|
ec361ea648
|
exchange rate fix
|
2015-05-11 18:14:45 +05:30 |
|
Nabin Hait
|
dd82bf2ad9
|
Exchange rate issue fixed
|
2015-05-11 16:49:31 +05:30 |
|
Rushabh Mehta
|
66fa1ff878
|
[enhancement] automatic exchange rates via jsonrates
|
2015-05-07 12:26:09 +05:30 |
|
Nabin Hait
|
0e1540b3b7
|
material request saving issue fixed
|
2015-05-05 17:26:35 +05:30 |
|
Nabin Hait
|
2b3e065efc
|
[fix] taxes and charges input value
|
2015-05-05 16:33:58 +05:30 |
|
Nabin Hait
|
61092c0a88
|
Pos item view: show item name and item code
|
2015-05-05 12:27:11 +05:30 |
|
Nabin Hait
|
c91a9e5231
|
Delete company and company transactions are separate functions
|
2015-05-04 11:51:21 +05:30 |
|
Rushabh Mehta
|
c712cdb580
|
[fix] tax with both actual and rate type
|
2015-05-03 22:20:56 +05:30 |
|
Nabin Hait
|
f550ecf93e
|
Maintain same currency exchnage rate while mapping
|
2015-05-02 18:46:42 +05:30 |
|
Nabin Hait
|
69cdf59d63
|
Maintain same currency exchnage rate while mapping
|
2015-05-02 18:46:29 +05:30 |
|
Nabin Hait
|
5207d1205e
|
minor issue fixed for precision
|
2015-04-29 15:38:14 +05:30 |
|
Rushabh Mehta
|
45ca8a4d31
|
[minor] save last company in multi-company scenario
|
2015-04-28 16:04:56 +05:30 |
|
Rushabh Mehta
|
38c6b52770
|
[rename] group_or_ledger to is_group
|
2015-04-23 13:14:17 +05:30 |
|
Rushabh Mehta
|
50918a8fcf
|
[pos] fixes #3138, #3140
|
2015-04-21 14:38:48 +05:30 |
|
Rushabh Mehta
|
5674c4f28c
|
[splash] new image
|
2015-04-16 15:09:42 +05:30 |
|
Rushabh Mehta
|
d64e928b50
|
[favicon] darker
|
2015-04-16 14:04:51 +05:30 |
|
Rushabh Mehta
|
2e7c36ec99
|
[favicon] light grey for erpnext
|
2015-04-16 12:41:42 +05:30 |
|
Nabin Hait
|
3c89605e57
|
minor fix in taxes and totals
|
2015-03-23 14:33:22 +05:30 |
|
Anand Doshi
|
2b2b639492
|
fixes
|
2015-03-20 14:29:23 +05:30 |
|
Neil Trini Lasrado
|
3d61bbb36a
|
fixes in get_serial_number function
|
2015-03-18 11:04:32 +05:30 |
|
Nabin Hait
|
a1bf43b1a6
|
Merged develop into v5
|
2015-03-17 10:50:47 +05:30 |
|
Anand Doshi
|
d6822ddd7c
|
manipulate grand total for inclusive tax
|
2015-03-13 18:23:10 +05:30 |
|
Rushabh Mehta
|
f5f0d5a83a
|
[breadcrumbs] refactor
|
2015-03-09 15:48:16 +05:30 |
|
Nabin Hait
|
e2f054cc27
|
transaction date issue in pricing rule fixed
|
2015-03-09 14:54:37 +05:30 |
|
Anand Doshi
|
e514323be4
|
load all js and css like before in desk.html
|
2015-03-06 13:17:26 +05:30 |
|
Rushabh Mehta
|
c4dce99f4b
|
[fixes] pos #2830, #2795
|
2015-03-05 15:09:04 +05:30 |
|
Anand Doshi
|
885e074697
|
Changed company name from Web Notes to Frappe Technologies
|
2015-03-03 14:56:43 +05:30 |
|
Rushabh Mehta
|
b83fa3bc2d
|
[pos] [barcode] fixes #2831
|
2015-03-02 18:25:14 +05:30 |
|
Rushabh Mehta
|
8c84fca182
|
[fix] #2875
|
2015-03-02 16:29:56 +05:30 |
|
Anand Doshi
|
16018dd474
|
removed erpnext splash
|
2015-03-01 21:16:44 +05:30 |
|
Nabin Hait
|
86cd4cc739
|
discount related fix
|
2015-02-28 19:12:55 +05:30 |
|
Nabin Hait
|
b7ae9b4283
|
Merge pull request #2866 from neilLasrado/barcode
Barcode added to stock entry
|
2015-02-27 11:35:07 +05:30 |
|
Anand Doshi
|
8f9e631a44
|
minor fixes
|
2015-02-26 20:29:43 +05:30 |
|
Neil Trini Lasrado
|
4374692cf5
|
fixes
|
2015-02-25 19:01:17 +05:30 |
|
Rushabh Mehta
|
2a21bc9fc2
|
[taxes and charges] refactor
|
2015-02-25 15:08:57 +05:30 |
|
Anand Doshi
|
28d21ba3c0
|
[minor] fix build.json
|
2015-02-24 22:28:26 +05:30 |
|
Anand Doshi
|
da858cc587
|
Website Product Image
|
2015-02-24 17:52:09 +05:30 |
|
Nabin Hait
|
93b3a37a3b
|
rounding issue and rate trigger
|
2015-02-24 17:08:51 +05:30 |
|
Nabin Hait
|
72c359afa2
|
valuation type charges can not be inclusive
|
2015-02-24 16:05:19 +05:30 |
|
Nabin Hait
|
903c42a130
|
multiplefixes
|
2015-02-24 15:24:49 +05:30 |
|
Nabin Hait
|
82e3e25cdb
|
fixes for base_rate, base_amount, tax_amount: mass search and replace
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
37b047d9a8
|
Fields added in all sales and purchase doctypes
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
613d081a60
|
Validate taxes and charges input, commonified
|
2015-02-24 10:02:28 +05:30 |
|
Nabin Hait
|
f0bc9b6d3a
|
Renamed Net total to Total and dynamic label
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
755ff60313
|
tax amount conversion in client side printing
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
de9c8a9028
|
discount calculation and in print view
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
2b019ed430
|
Fixes for discount amount
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
ce24512ed7
|
Commonified sales/purchase taxes and charges master.js code
|
2015-02-24 10:02:27 +05:30 |
|
Nabin Hait
|
e7679703cf
|
Taxes and totals calculation in party currency
|
2015-02-24 10:02:27 +05:30 |
|
Anand Doshi
|
f9fc04ce8e
|
Website Listing
|
2015-02-23 22:34:27 +05:30 |
|
Rushabh Mehta
|
614e7ab757
|
[cleanup] SMS, and added item filter in stock balance
|
2015-02-18 19:51:48 +05:30 |
|
Nabin Hait
|
7c28fc4014
|
Merge branch 'v5.0' of https://github.com/frappe/erpnext into v5.0
|
2015-02-18 12:24:49 +05:30 |
|
Anand Doshi
|
8c0f05fbae
|
[minor] grid report loading
|
2015-02-17 19:53:23 +05:30 |
|
Nabin Hait
|
bd00e81ad5
|
Commonified taxes and totals calculation in server side
|
2015-02-17 12:50:51 +05:30 |
|
Nabin Hait
|
6f0a3ed8d4
|
fixed conflict
|
2015-02-17 11:12:04 +05:30 |
|
Rushabh Mehta
|
46e03eadca
|
[rename] Customer Issue -> Warranty Claim
|
2015-02-17 10:45:50 +05:30 |
|
Nabin Hait
|
188f69a713
|
commonified totals calculation in js
|
2015-02-12 17:55:50 +05:30 |
|
Nabin Hait
|
5690be103c
|
Replaced renamed total fields in code files
|
2015-02-12 16:09:11 +05:30 |
|
Nabin Hait
|
7945712171
|
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
|
2015-02-11 12:55:10 +05:30 |
|
Nabin Hait
|
15cd12214e
|
Fixed conflict while merging v4 into v5
|
2015-02-10 16:37:18 +05:30 |
|
Anand Doshi
|
9b30a8626c
|
[minor] removed default filters for sales order and material request, fixed pos css
|
2015-02-06 12:30:08 +05:30 |
|
Anand Doshi
|
dea3fb0d64
|
[fix] call calculate code only once after applying pricing rule
|
2015-02-05 15:06:16 +05:30 |
|
Anand Doshi
|
dd942bb3d2
|
[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists
|
2015-02-04 18:53:24 +05:30 |
|
Rushabh Mehta
|
c567e8e960
|
[fix] analytics reports + remove print item tables #2667
|
2015-02-03 17:56:25 +05:30 |
|
Rushabh Mehta
|
052bd624c1
|
[minor] removed company description and don't call apply_price_list if no items
|
2015-01-30 16:57:24 +05:30 |
|
Anand Doshi
|
aff9a59f2d
|
[minor] removed pscript from Feature Setup, made Activity Type as mandator in Time Log
|
2015-01-29 19:49:34 +05:30 |
|
Nabin Hait
|
d41f3c1f5e
|
All the calculations in taxes_and_totals file
|
2015-01-23 16:24:49 +05:30 |
|
Nabin Hait
|
b4a3dfa893
|
All the calculations in taxes_and_totals file
|
2015-01-22 17:13:13 +05:30 |
|
Anand Doshi
|
88a1515b46
|
[minor] ERPNext as navbar-home
|
2015-01-21 18:25:04 +05:30 |
|
Nabin Hait
|
963393409e
|
minor fix: child table length
|
2015-01-21 17:22:11 +05:30 |
|
Anand Doshi
|
f02e142d5d
|
[design] mobile
|
2015-01-19 15:59:45 +05:30 |
|
Nabin Hait
|
239c2c327c
|
Hide currency and price list section after submission
|
2015-01-15 14:22:04 +05:30 |
|
Nabin Hait
|
fff3ab752c
|
Fixed conflict
|
2015-01-14 16:27:13 +05:30 |
|
Nabin Hait
|
2244ac4d52
|
Discount amount in party currency
|
2015-01-12 17:35:37 +05:30 |
|
Neil Trini Lasrado
|
0866272ba1
|
get fiscal year fix
|
2015-01-12 16:41:55 +05:30 |
|
Rushabh Mehta
|
135fe3405f
|
[ui] listviews
|
2015-01-12 16:11:02 +05:30 |
|
Anand Doshi
|
50d7e8cf8f
|
[design] Point of Sale
|
2015-01-06 17:14:26 +05:30 |
|
Anand Doshi
|
9b955feff8
|
[design] POS - item grid and taxes
|
2015-01-05 16:19:12 +05:30 |
|
Anand Doshi
|
3f5e95a99e
|
[design] Fixed Grid Reports
|
2015-01-01 16:26:18 +05:30 |
|
Rushabh Mehta
|
4c36d7388c
|
[ux] fixed creation via tree views for Item Group etc
|
2015-01-01 15:59:34 +05:30 |
|
Rushabh Mehta
|
bfaf0a8f43
|
[tree] [ui]
|
2015-01-01 12:49:18 +05:30 |
|
Rushabh Mehta
|
7a8f009116
|
[fixes]
|
2014-12-31 15:34:37 +05:30 |
|
Rushabh Mehta
|
419ae33c3e
|
[merge] v5-design
|
2014-12-31 15:03:14 +05:30 |
|
Nabin Hait
|
54361e8651
|
fixed conflict while merging develop into v5
|
2014-12-31 13:24:36 +05:30 |
|
Rushabh Mehta
|
afbfdcf552
|
[ui] minor fixes
|
2014-12-30 18:11:32 +05:30 |
|
Nabin Hait
|
54c31b498b
|
Fixes in Stock Analytics
|
2014-12-30 16:33:07 +05:30 |
|
Nabin Hait
|
7d8fa8089a
|
always calculate taxes and totals onchange of exchange rate
|
2014-12-30 15:35:59 +05:30 |
|
Nabin Hait
|
dd38a266b8
|
Removed tname and fname from code
|
2014-12-26 13:15:21 +05:30 |
|
Rushabh Mehta
|
a5b149c061
|
[design] module pages, messages, timelines
|
2014-12-26 12:53:02 +05:30 |
|
Rushabh Mehta
|
4096a3ab2b
|
[design] form toolbar
|
2014-12-26 12:53:02 +05:30 |
|
Rushabh Mehta
|
a9ba5eff99
|
[design] pos
|
2014-12-26 12:52:11 +05:30 |
|
Rushabh Mehta
|
f870527e7c
|
[design] wip
|
2014-12-26 12:52:11 +05:30 |
|
Nabin Hait
|
79f091e2fe
|
field renaming
|
2014-12-26 11:41:15 +05:30 |
|
Nabin Hait
|
e7d153624f
|
Table Field Renaming: code replace, JV and budget distribution renamed
|
2014-12-25 16:01:55 +05:30 |
|
Neil Trini Lasrado
|
31a92bd9d9
|
company wise letter head feature added
|
2014-12-23 17:52:41 +05:30 |
|
Nabin Hait
|
cfe3c54ca0
|
Dont reset pricing if ignore pricing rule
|
2014-12-22 10:43:10 +05:30 |
|
Nabin Hait
|
49a2729663
|
Reapply price list if pricing rule reset as blank
|
2014-12-17 11:24:00 +05:30 |
|
Nabin Hait
|
b072c74efc
|
render address and contacts for party
|
2014-12-16 12:49:13 +05:30 |
|
Rushabh Mehta
|
6d950d23a8
|
[merge]
|
2014-11-28 12:08:51 +05:30 |
|
ankitjavalkarwork
|
9269c86339
|
Display mobile no of contact
|
2014-11-27 17:13:36 +05:30 |
|
Rushabh Mehta
|
0a7abc188e
|
[minor] [ux] contact template
|
2014-11-24 15:06:40 +05:30 |
|
Rushabh Mehta
|
5eeef7f065
|
[refactor] address and contact list in customer, supplier, lead, sales person
|
2014-11-24 14:16:51 +05:30 |
|
Rushabh Mehta
|
7d36875d6f
|
[refactor] address and contact list in customer, supplier, lead, sales person
|
2014-11-24 14:16:47 +05:30 |
|
Neil Trini Lasrado
|
2c388f9d7e
|
POS feature #2305
|
2014-11-11 16:00:09 +05:30 |
|
Nabin Hait
|
ae1dcabcb5
|
Fixed merge conflict
|
2014-11-05 12:41:02 +05:30 |
|
Nabin Hait
|
28913b97b0
|
[fix] Null issue fixed in stock analytics report
|
2014-10-31 14:46:25 +05:30 |
|
Rushabh Mehta
|
3daa49ac1f
|
[shopping-cart] i'm back
|
2014-10-21 16:16:30 +05:30 |
|
Rushabh Mehta
|
be1a8d82c5
|
[merge] develop
|
2014-10-21 13:14:55 +05:30 |
|
Neil Trini Lasrado
|
eaae58f507
|
Transaction.js fixed , code commonified
|
2014-10-09 15:01:13 +05:30 |
|
Neil Trini Lasrado
|
565d986198
|
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
|
2014-10-09 15:01:12 +05:30 |
|
Neil Trini Lasrado
|
e6b14a4bf6
|
Fixed issues
|
2014-10-09 15:01:12 +05:30 |
|
Neil Trini Lasrado
|
78fa6954e5
|
Fiscal year autofetch added
|
2014-10-09 15:01:12 +05:30 |
|
Nabin Hait
|
e96e83d557
|
stock reco and repost vouchers
|
2014-10-08 18:06:14 +05:30 |
|
Nabin Hait
|
b96c014daf
|
Stock Reconciliation logic simplified
|
2014-10-08 11:02:18 +05:30 |
|
Nabin Hait
|
b783f519ee
|
Fixes in sales/purchase invoice trends report
|
2014-09-26 14:23:00 +05:30 |
|
Anand Doshi
|
1394509343
|
Fixes for recurring document
|
2014-09-21 19:45:49 +05:30 |
|
81552433qqcom
|
6d02939256
|
changed indent. as well use tab instead of space.
|
2014-09-12 16:22:28 +05:30 |
|
81552433qqcom
|
e3b63f2d9c
|
added __() for options that need label.
|
2014-09-12 16:07:12 +05:30 |
|
81552433qqcom
|
1c440b3b31
|
month options doesn't get translated.
|
2014-09-12 16:07:12 +05:30 |
|
Neil Trini Lasrado
|
ad24069cdc
|
[fix] issue 448 final
|
2014-08-26 16:30:39 +05:30 |
|
Anand Doshi
|
43f087c99d
|
[hotfix] Supplier read permission for Purchase User
[Fix] Issue #448
[Fix] Issue #448 2
|
2014-08-26 16:30:39 +05:30 |
|
Rushabh Mehta
|
e8dd4160d4
|
[cleanup] remove allow_attach
|
2014-08-25 13:04:21 +05:30 |
|
Nabin Hait
|
4417529952
|
Packing list visibility issue
|
2014-08-21 16:44:32 +05:30 |
|
Nabin Hait
|
0a35effe49
|
Precision issue in tax calculation
|
2014-08-19 13:22:19 +05:30 |
|
Rushabh Mehta
|
ab8bde0149
|
[ux] added folds, show actual / projected qty in pos
|
2014-08-14 11:43:46 +05:30 |
|
Rushabh Mehta
|
23607f91cd
|
[fix] [pos] pos view only for draft docs
|
2014-08-08 17:29:16 +05:30 |
|
Rushabh Mehta
|
72e1719220
|
added icon for pos
|
2014-08-08 15:43:26 +05:30 |
|
Rushabh Mehta
|
995185d02d
|
[ux] fixed primary action
|
2014-08-08 11:51:23 +05:30 |
|
nabinhait
|
b739264243
|
Don't run company trigger on amendment
|
2014-07-28 16:41:33 +05:30 |
|
Anand Doshi
|
39edcbc93b
|
[minor] apply pricing rule / price list only if item_code
|
2014-07-28 16:00:19 +05:30 |
|
Anand Doshi
|
cb86d597b7
|
Report: Trial Balance
|
2014-07-22 19:49:16 +05:30 |
|
Anand Doshi
|
5f0459c321
|
Fixes to Financial Statements
|
2014-07-21 16:13:06 +05:30 |
|
Anand Doshi
|
825d014616
|
Commonfied code for Financial Statements and added Profit and Loss Statement
|
2014-07-21 11:43:18 +05:30 |
|
Anand Doshi
|
f214bfcfc3
|
Fixes in load defaults of transaction.js
|
2014-07-16 17:53:02 +05:30 |
|
nabinhait
|
d5fd535909
|
Minor fix, if no default company
|
2014-07-14 12:39:50 +05:30 |
|
nabinhait
|
ff2cc1626e
|
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
|
2014-07-08 15:30:25 +05:30 |
|
nabinhait
|
bc408d8d0b
|
Run trigger of company field on onload function, even if company exists
|
2014-07-07 17:56:24 +05:30 |
|