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 |
|
Anand Doshi
|
51f722d20f
|
Trigger Apply Price List on change of Currency Conversion Rate or Price List Currency Conversion Rate
|
2014-07-04 15:44:49 +05:30 |
|
Anand Doshi
|
dffec8fb85
|
Reapply Price List on Change
|
2014-07-04 15:44:48 +05:30 |
|
Anand Doshi
|
610a405c85
|
Fix in warehouse query
|
2014-06-25 13:30:26 +05:30 |
|
Anand Doshi
|
faefeaa644
|
Warehouse query filtered by company
|
2014-06-24 18:53:04 +05:30 |
|
Nabin Hait
|
444f956e7b
|
Pricing Rule fixes and improvements. Fixes #1795
|
2014-06-20 16:00:45 +05:30 |
|
Nabin Hait
|
4d7c4fc0f4
|
Get party details fixes
|
2014-06-18 16:40:59 +05:30 |
|
Anand Doshi
|
205438669a
|
Removed clear_custom_buttons, pos view switch fix
|
2014-06-12 15:00:51 +05:30 |
|
Anand Doshi
|
8cead48342
|
Merge pull request #1756 from rmehta/develop
removed sms control and related cleanup, fixes frappe/erpnext#462
|
2014-06-06 14:52:22 +05:30 |
|
Rushabh Mehta
|
880b3ef6c0
|
added qty updating option multi-item selector
|
2014-06-06 11:45:30 +05:30 |
|
Rushabh Mehta
|
ba83e9cfbe
|
removed sms control and related cleanup, fixes frappe/erpnext#462
|
2014-06-05 17:56:42 +05:30 |
|
Nabin Hait
|
b7438894f6
|
Fixes in trends report
|
2014-06-05 17:55:00 +05:30 |
|
Anand Doshi
|
221dec8cac
|
transaction.js: calculate only if one entry in table
|
2014-06-04 17:48:57 +05:30 |
|
Anand Doshi
|
ffc28faa51
|
Merge pull request #1744 from rmehta/develop
added multiple item select and allow non purchase items in Material Requ...
|
2014-06-04 17:47:58 +05:30 |
|
Rushabh Mehta
|
b6843f2087
|
added multiple item select and allow non purchase items in Material Request of type transfer
|
2014-06-04 13:10:41 +05:30 |
|
Nabin Hait
|
b15764ef2c
|
Translation issue fixed in analytics/grid report
|
2014-06-03 13:02:39 +05:30 |
|
Nabin Hait
|
51b7f322cc
|
Closing balance fixes in trial balance. Fixes #1730
|
2014-06-02 18:47:46 +05:30 |
|
Nabin Hait
|
c1367d9d10
|
minor fixes
|
2014-05-30 11:43:00 +05:30 |
|
Nabin Hait
|
a3dd72a759
|
Pricing Rule
|
2014-05-30 11:22:10 +05:30 |
|
Rushabh Mehta
|
1bf9df7c85
|
removed about
|
2014-05-28 13:15:32 +05:30 |
|
Rushabh Mehta
|
f944e819e9
|
fixes #1581 and added icons to grid reports
|
2014-05-27 15:22:04 +05:30 |
|
Nabin Hait
|
03f3a8a2ef
|
Get taxes and charges records from matser. Fixes #1634
|
2014-05-13 16:38:31 +05:30 |
|
Nabin Hait
|
053a87edf6
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2014-05-02 17:37:38 +05:30 |
|
Nabin Hait
|
bc83b9c1ac
|
minor fix
|
2014-05-02 17:03:18 +05:30 |
|
Anand Doshi
|
b71a18cd1e
|
Leave Allocation Tool and Employee. Fixes #1555
|
2014-05-02 16:23:51 +05:30 |
|
Nabin Hait
|
6b03914731
|
asynchronus issue in get_party_details
|
2014-05-02 15:45:10 +05:30 |
|
Anand Doshi
|
cd17bdffcd
|
Fixes in account query, fiscal year and cost center
|
2014-04-28 20:34:48 +05:30 |
|
Anand Doshi
|
8bde7f9b3a
|
Conditionally toggle Naming Series. Fixes #1526
|
2014-04-24 18:11:49 +05:30 |
|
Anand Doshi
|
78eeacb53c
|
Fixes in Lead, Opportunity, Quotation, Setup Wizard
|
2014-04-23 19:15:15 +05:30 |
|
Anand Doshi
|
b054eb7a4f
|
Call calculate_taxes_and_totals after mapping
|
2014-04-22 20:35:22 +05:30 |
|
Anand Doshi
|
ac32bad25a
|
Fixes in Taxes, Quotation and Address Territory
|
2014-04-18 01:32:02 +05:30 |
|
Rushabh Mehta
|
c38fc713c6
|
updated translations
|
2014-04-16 17:46:30 +05:30 |
|
Anand Doshi
|
652bc0784a
|
Ported v3 fixes to v4
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
|
2014-04-16 15:26:42 +05:30 |
|
Rushabh Mehta
|
ff93802d58
|
more message fixes
|
2014-04-15 18:40:31 +05:30 |
|
Rushabh Mehta
|
8a40c136ce
|
more message fixing
|
2014-04-15 16:31:20 +05:30 |
|
Anand Doshi
|
5d4ffa6cf8
|
Fixed splash.svg
|
2014-04-15 13:09:09 +05:30 |
|
Pratik Vyas
|
b52618c142
|
frappe._ to __
|
2014-04-14 16:25:30 +05:30 |
|
Rushabh Mehta
|
66d52b55c0
|
#478
|
2014-03-27 14:17:33 +05:30 |
|
Rushabh Mehta
|
aa355af2cf
|
refactored client side Model and Meta - frappe/frappe#478
|
2014-03-26 18:24:30 +05:30 |
|
Nabin Hait
|
b5e6d7e171
|
Account balance in debit and credit columns in trial balance and financial analytics report
|
2014-03-21 11:26:09 +05:30 |
|
Nabin Hait
|
73083dc960
|
Fix related to user_default
|
2014-03-21 11:26:08 +05:30 |
|
Nabin Hait
|
2b57ecbd6c
|
fixes for debit_or_credit in account tree grid report
|
2014-03-21 11:22:38 +05:30 |
|
Anand Doshi
|
2134d24b36
|
Removed cloud subscription logic
|
2014-03-14 15:24:57 +05:30 |
|
Rushabh Mehta
|
7c932003ed
|
rename Profile to User frappe/frappe#470
|
2014-03-11 16:15:59 +05:30 |
|
Rushabh Mehta
|
6fbda08583
|
fixed sitemap patch
|
2014-02-20 19:03:03 +05:30 |
|
Nabin Hait
|
0f2310690e
|
fix in fetch item details and supplier non-mandatory to fetch
|
2014-02-20 11:27:47 +05:30 |
|
Nabin Hait
|
9d1f077922
|
get lead details in quotation
|
2014-02-19 17:43:24 +05:30 |
|
Nabin Hait
|
05b28eb161
|
minor fixes
|
2014-02-19 11:04:32 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
139dc7b9b2
|
minor fixes
|
2014-02-12 14:54:16 +05:30 |
|
Nabin Hait
|
1eb560130a
|
Rename fields: amount related fields
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
7979f7ed21
|
Field Rename: rate field mass replacement
|
2014-02-12 14:54:14 +05:30 |
|
Nabin Hait
|
a7f757a3f4
|
Rename fields: initial commit
|
2014-02-12 14:54:13 +05:30 |
|
Rushabh Mehta
|
4b41e420c0
|
cleaned up splash:
|
2014-02-06 11:02:53 +05:30 |
|
Rushabh Mehta
|
cc008cc109
|
commonified get_party_details
|
2014-02-03 16:14:56 +05:30 |
|
Rushabh Mehta
|
347889b233
|
merge
|
2014-02-03 14:49:53 +05:30 |
|
Rushabh Mehta
|
8612778136
|
style fix
|
2014-02-03 10:45:21 +05:30 |
|
Akhilesh Darjee
|
e0a1039756
|
merge conflict fixed
|
2014-01-30 14:44:35 +05:30 |
|
Akhilesh Darjee
|
4cdb79941b
|
map charge to taxes and charges in transactions
|
2014-01-30 13:56:57 +05:30 |
|
Nabin Hait
|
0ff32e73ba
|
Merged with 4.0.0-wip
|
2014-01-30 12:41:52 +05:30 |
|
Nabin Hait
|
fe8db590a1
|
Fixed conflict while merging with develop
|
2014-01-30 12:32:47 +05:30 |
|
Nabin Hait
|
b87e9f2651
|
Fixes in fetching party details
|
2014-01-29 19:51:36 +05:30 |
|
Akhilesh Darjee
|
4f7215662d
|
webnotes/erpnext#1090 set default tax type in customer and supplier
|
2014-01-29 16:31:38 +05:30 |
|
Rushabh Mehta
|
24da761a17
|
more updates to party
|
2014-01-29 15:26:04 +05:30 |
|
Rushabh Mehta
|
49dd7bee87
|
added get_supplier_details and commonified invoice functions
|
2014-01-28 17:43:10 +05:30 |
|
Nabin Hait
|
21d324c597
|
Merged with 4.0-wip
|
2014-01-28 15:52:25 +05:30 |
|
Rushabh Mehta
|
7460dcf406
|
updated Bootstrap
|
2014-01-22 12:44:46 +05:30 |
|
Nabin Hait
|
5c6d13a0df
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:18:16 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
e27717261d
|
merge conflict fixed
|
2014-01-03 18:18:31 +05:30 |
|
Akhilesh Darjee
|
57738a0ff3
|
flat discount replaced to discount amount
|
2014-01-03 18:15:07 +05:30 |
|
Rushabh Mehta
|
b09d9dabc5
|
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
|
2014-01-02 11:47:23 +05:30 |
|
Anand Doshi
|
9a4a13cb73
|
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
|
2013-12-31 17:38:21 +05:30 |
|
Akhilesh Darjee
|
d203aea7c2
|
[flat discount] flat discount implemented on sales cycle
|
2013-12-27 17:49:57 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
2b08985e16
|
Translations redesigned webnotes/wnframework#351
|
2013-12-19 18:27:48 +05:30 |
|
Rushabh Mehta
|
6de403f2be
|
added manifest, hooks and fixed requires webnotes/wnframework#351
|
2013-12-13 14:10:14 +05:30 |
|
Rushabh Mehta
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +05:30 |
|
Pratik Vyas
|
1b23208779
|
[minor] get bundle working, almost
|
2013-12-12 10:44:38 +05:30 |
|
Rushabh Mehta
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|