Rushabh Mehta
|
23607f91cd
|
[fix] [pos] pos view only for draft docs
|
2014-08-08 17:29:16 +05:30 |
|
Anand Doshi
|
3a97739f83
|
Merge pull request #2042 from rmehta/pos-module
added icon for pos
|
2014-08-08 16:56:45 +05:30 |
|
Rushabh Mehta
|
e0ee6fe8cd
|
Merge pull request #2044 from nabinhait/hotfix
PO-PI mapping: divisional loss issue fixed
|
2014-08-08 16:44:15 +05:30 |
|
Rushabh Mehta
|
a3f76fc14d
|
Update sales_invoice.js
|
2014-08-08 16:43:21 +05:30 |
|
Nabin Hait
|
c85abbfeca
|
PO-PI mapping: divisional loss issue fixed
|
2014-08-08 16:07:02 +05:30 |
|
Rushabh Mehta
|
139ec2a64f
|
Update note_list.html
|
2014-08-08 15:47:56 +05:30 |
|
Rushabh Mehta
|
72e1719220
|
added icon for pos
|
2014-08-08 15:43:26 +05:30 |
|
Pratik Vyas
|
3de7757ba4
|
Update update_project_milestones.py
|
2014-08-08 14:49:53 +05:30 |
|
Anand Doshi
|
6b8145a813
|
[patch] Add currency Turkish Lira
|
2014-08-08 14:05:01 +05:30 |
|
Nabin Hait
|
688a7a7329
|
Merge pull request #2039 from anandpdoshi/anand-august-8
[fix] Show Employee Name in Employee Birthday report
|
2014-08-08 13:21:36 +05:30 |
|
Anand Doshi
|
26201a5828
|
[fix] Show Employee Name in Employee Birthday report
|
2014-08-08 12:49:11 +05:30 |
|
Anand Doshi
|
6cd59537b6
|
Merge pull request #2037 from nabinhait/hotfix
Fixes in 'Received Items to be Billed' report
|
2014-08-08 12:45:56 +05:30 |
|
Anand Doshi
|
4cc94df752
|
[tests] Fixed Test Records
|
2014-08-08 11:56:32 +05:30 |
|
Anand Doshi
|
03eadb74ab
|
Fixes to microtemplate feature
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
7a4e739d6c
|
templating for hr
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
a660464cec
|
added for support
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
c9bd3f5d4a
|
added templates for projects
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
873141c1a5
|
more updates to lists and started sane filters
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
8544447b19
|
added more listview templates
|
2014-08-08 11:56:32 +05:30 |
|
Rushabh Mehta
|
18eb4f5015
|
added listviews for sales, purchase
|
2014-08-08 11:56:31 +05:30 |
|
Rushabh Mehta
|
67af99794d
|
start custom list rendering for Sales Order
|
2014-08-08 11:56:31 +05:30 |
|
Rushabh Mehta
|
b5e768906a
|
built item grids for sales, purchase, stock
|
2014-08-08 11:56:31 +05:30 |
|
Anand Doshi
|
69ccf9695c
|
[minor] primary action
|
2014-08-08 11:51:24 +05:30 |
|
Rushabh Mehta
|
995185d02d
|
[ux] fixed primary action
|
2014-08-08 11:51:23 +05:30 |
|
Nabin Hait
|
f4de6e21fa
|
Fixes in 'Received Items to be Billed' report
|
2014-08-08 11:23:59 +05:30 |
|
Nabin Hait
|
a6db05e18d
|
Fixes in 'Received Items to be Billed' report
|
2014-08-08 11:02:06 +05:30 |
|
Nabin Hait
|
d91cefb23d
|
Update fix_account_master_type.py
|
2014-08-07 19:22:02 +05:30 |
|
Nabin Hait
|
67cd3fb89c
|
Fixes in making credit note from Sales Return
|
2014-08-07 15:34:53 +05:30 |
|
Nabin Hait
|
849b7b172a
|
minor fix
|
2014-08-07 15:13:52 +05:30 |
|
Nabin Hait
|
9a0c46fda7
|
Get Stock Rreceived But Not Billed Difference Amount
|
2014-08-07 15:10:05 +05:30 |
|
Nabin Hait
|
05b56d0d08
|
Fix account's master type
|
2014-08-07 15:03:41 +05:30 |
|
Nabin Hait
|
7881df2138
|
minor fix
|
2014-08-06 17:29:07 +05:30 |
|
Nabin Hait
|
fd90571d49
|
fiscal year validation in financial statement
|
2014-08-06 17:25:23 +05:30 |
|
Nabin Hait
|
9f7e00bb3a
|
Send salary slip mail after submit via Salary Manager
|
2014-08-06 17:25:23 +05:30 |
|
Nabin Hait
|
45b7d17ee8
|
Employee can be reselected but not changed in salary structure
|
2014-08-06 17:25:23 +05:30 |
|
Anand Doshi
|
959bd6e9e7
|
[test] Block Delivery Note if it is linked to a cancelled Sales Order
|
2014-08-05 14:25:40 +05:30 |
|
Anand Doshi
|
f16fefafe3
|
[print] [fix] empty item grid issue
|
2014-08-05 13:57:29 +05:30 |
|
Anand Doshi
|
8d16e9fd6d
|
[print] convert newlines to <br> based on fieldtype for Text/Small Text
|
2014-08-05 11:39:51 +05:30 |
|
Anand Doshi
|
2b8344e75c
|
[print] [fix] when item grid is empty
|
2014-08-05 11:30:37 +05:30 |
|
Rushabh Mehta
|
a8755af0fa
|
Merge pull request #2022 from nabinhait/hotfix
Fixes for customer / supplier renaming
|
2014-08-05 10:42:44 +05:30 |
|
Rushabh Mehta
|
ca70eaa388
|
Merge pull request #2019 from anandpdoshi/anand-august-1
Account Issues
|
2014-08-05 10:36:08 +05:30 |
|
Pratik Vyas
|
1271bc4457
|
[hotfix] [patch] remove missing patch
|
2014-08-05 06:54:11 +05:30 |
|
Nabin Hait
|
4d18b3f96d
|
Fixes for standard print formats
|
2014-08-04 17:01:01 +05:30 |
|
Nabin Hait
|
1279f1d430
|
Fixes for customer / supplier renaming
|
2014-08-04 13:05:59 +05:30 |
|
Anand Doshi
|
e88b7fbcc4
|
Journal Voucher Detail: show Account Balance as Dr or Cr. Fixes #675
|
2014-08-01 16:56:32 +05:30 |
|
Anand Doshi
|
8c838061f9
|
[minor] Check account read permission for get_balance_on
|
2014-08-01 16:13:44 +05:30 |
|
Anand Doshi
|
6c608e04bc
|
Fixes #699 - Cost Center mandatory
|
2014-08-01 16:04:35 +05:30 |
|
Anand Doshi
|
a66ef778ec
|
[translations] Added Turkish, Vietnamese. Updated rest of the translations. [frappe/erpnext#2012]
|
2014-08-01 00:06:42 +05:30 |
|
Anand Doshi
|
1b90207360
|
[minor] [fix] Serial No Servic Contract Expiry
|
2014-07-31 18:57:51 +05:30 |
|
Anand Doshi
|
3f28ac3205
|
Merge pull request #2010 from anandpdoshi/anand-july-31
[print] Labels and Total Taxes and Charges
|
2014-07-31 16:31:57 +05:30 |
|
Anand Doshi
|
29817d6d8b
|
[print] Moved Total Taxes and Charges to the right column
|
2014-07-31 16:05:19 +05:30 |
|
Anand Doshi
|
92980e6882
|
Merge pull request #2009 from anandpdoshi/anand-july-31
Labels: Use Date instead of Posting Date
|
2014-07-31 15:07:11 +05:30 |
|
Pratik Vyas
|
b91079676d
|
[patch] remove reloading of removed print formats
|
2014-07-31 14:31:58 +05:30 |
|
Anand Doshi
|
fbe37c9158
|
Labels: Use Date instead of Posting Date
|
2014-07-31 14:31:25 +05:30 |
|
nabinhait
|
8efd74b9b1
|
Activity: fix for timeline-wise display
|
2014-07-31 12:12:05 +05:30 |
|
nabinhait
|
8dbd295c9b
|
bom operations on_delete_row function
|
2014-07-31 11:40:41 +05:30 |
|
nabinhait
|
d6ff58daa1
|
Minor fix in customer issue
|
2014-07-31 11:40:41 +05:30 |
|
nabinhait
|
4859b48c43
|
message fix
|
2014-07-31 11:40:41 +05:30 |
|
nabinhait
|
c34329284b
|
Post gl entries only if there are atleast 2 distinct account head
|
2014-07-31 11:40:41 +05:30 |
|
nabinhait
|
0ad677045a
|
Test record fixed for warehouse
|
2014-07-31 11:40:40 +05:30 |
|
nabinhait
|
c1f65dd863
|
Validation: Account must belong to the same company
|
2014-07-31 11:40:40 +05:30 |
|
Anand Doshi
|
35cc320e21
|
[fixes] Leave Application and Toggle Rounded Totals
|
2014-07-30 17:00:26 +05:30 |
|
Anand Doshi
|
627f13ea26
|
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
|
2014-07-30 13:09:01 +05:30 |
|
Anand Doshi
|
60ee2ea8af
|
[hotfix] Stock Entry search fields
|
2014-07-29 23:16:24 +05:30 |
|
Anand Doshi
|
bc708ee4c2
|
[print] Disable rounded total
|
2014-07-29 22:24:31 +05:30 |
|
Anand Doshi
|
0e93352c8d
|
[print] Hide Rate, Amount if Print Without Amount in Delivery Note
|
2014-07-29 22:03:40 +05:30 |
|
Anand Doshi
|
a12312553b
|
Merge pull request #1997 from nabinhait/hotfix
Fixes
|
2014-07-29 15:48:04 +05:30 |
|
nabinhait
|
78777e141a
|
minor fix
|
2014-07-29 15:19:41 +05:30 |
|
Anand Doshi
|
ad1638e6b6
|
[print] Improvements to Item grid
|
2014-07-29 14:38:48 +05:30 |
|
nabinhait
|
0bab81aef9
|
minor fix in chart of accounts help message
|
2014-07-29 12:59:47 +05:30 |
|
nabinhait
|
92a1e06665
|
message fix
|
2014-07-29 12:46:56 +05:30 |
|
nabinhait
|
079611936f
|
Delete Payment-to-invoice-matching-tool through patch
|
2014-07-29 12:12:09 +05:30 |
|
nabinhait
|
d4b92a1d20
|
Set ignore pricing rule while mapping SI to DN
|
2014-07-29 11:35:41 +05:30 |
|
nabinhait
|
7555d619f2
|
Message for frozen stock entries
|
2014-07-29 11:35:41 +05:30 |
|
Anand Doshi
|
bd748bd115
|
[hotfix] [patch] Delete old print formats
|
2014-07-29 08:51:41 +05:30 |
|
Anand Doshi
|
85eefadada
|
[fix] [print] Print Hide Item Code
|
2014-07-28 21:17:20 +05:30 |
|
Anand Doshi
|
07d3261467
|
[hotfix] don't override default print format if specified in POS Sales Invoice
|
2014-07-28 19:55:13 +05:30 |
|
Anand Doshi
|
11586eda4c
|
[minor] [fix] taxes print
|
2014-07-28 17:38:08 +05:30 |
|
nabinhait
|
0a35277c96
|
Stock reconciliation only for valuation
|
2014-07-28 16:41:34 +05:30 |
|
nabinhait
|
16317748dd
|
Issue fixes related to length of the report result
|
2014-07-28 16:41:34 +05:30 |
|
nabinhait
|
3d48a4ef65
|
Sales / purchase return: Get party details fix
|
2014-07-28 16:41:33 +05:30 |
|
nabinhait
|
b739264243
|
Don't run company trigger on amendment
|
2014-07-28 16:41:33 +05:30 |
|
nabinhait
|
957971eb1d
|
Column added 'Reqd by Date' in po_items_to_be_billed report
|
2014-07-28 16:41:33 +05:30 |
|
Anand Doshi
|
e3c161f0ea
|
Merge pull request #1995 from anandpdoshi/anand-july-28
[minor] apply pricing rule / price list only if item_code
|
2014-07-28 16:05:42 +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
|
beb3e35153
|
Merge pull request #1989 from dalwadani/develop
Improve Arabic Translation
|
2014-07-28 15:46:22 +05:30 |
|
Anand Doshi
|
57f8dabf59
|
[minor] Show company name in General Ledger print
|
2014-07-28 15:28:44 +05:30 |
|
Anand Doshi
|
9c018fe984
|
[minor] Fixed address listing
|
2014-07-28 12:59:52 +05:30 |
|
Dhaifallah Alwadani
|
faeca7cf11
|
Improve Arabic Translation
|
2014-07-26 05:43:03 +03:00 |
|
Anand Doshi
|
93e2defc96
|
[fix] Feed listing based on permissions
|
2014-07-25 14:57:37 +05:30 |
|
Anand Doshi
|
8f49cf7c03
|
[minor] fixed testcase
|
2014-07-25 13:02:29 +05:30 |
|
Anand Doshi
|
62b1cbf003
|
[impact] Limit available functions in jinja environment
|
2014-07-25 13:02:29 +05:30 |
|
Anand Doshi
|
a5437cdac1
|
Fixes for print
|
2014-07-25 13:02:28 +05:30 |
|
Anand Doshi
|
16deabef82
|
Format Qty
|
2014-07-25 13:02:28 +05:30 |
|
ankitjavalkarwork
|
82ec488b99
|
Payment Reconciliation Feature/Tool - Patch
|
2014-07-25 13:02:28 +05:30 |
|
Rushabh Mehta
|
781ddc3a25
|
added patch to remove old print formats
|
2014-07-25 13:02:28 +05:30 |
|
Rushabh Mehta
|
85ff3bcd04
|
updated pos invoice
|
2014-07-25 13:01:53 +05:30 |
|
Rushabh Mehta
|
5b51cc86a9
|
many fixes to print
|
2014-07-25 13:01:53 +05:30 |
|
Rushabh Mehta
|
d82352eacc
|
item grid, added other printable fields in description
|
2014-07-25 13:01:53 +05:30 |
|
Rushabh Mehta
|
f84c240d1c
|
cleanup for print format
|
2014-07-25 13:01:52 +05:30 |
|
Rushabh Mehta
|
28804bfb62
|
started sales order print format (new style)
|
2014-07-25 13:01:52 +05:30 |
|
Nabin Hait
|
5cf3a6bcd2
|
Merge pull request #1975 from anandpdoshi/anand-july-22
Trial Balance and Newsletter sending via Worker
|
2014-07-25 11:21:13 +05:30 |
|
Anand Doshi
|
329a8ef9a1
|
Merge pull request #1985 from ankitjavalkarwork/payrec
Remove Payment To Invoice Matching Tool
|
2014-07-24 18:57:46 +05:30 |
|
ankitjavalkarwork
|
344dd3793a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into payrec
|
2014-07-24 15:15:12 +05:30 |
|
ankitjavalkarwork
|
d93f4c99e1
|
Remove Payment To Invoice Matching Tool
|
2014-07-24 15:14:36 +05:30 |
|
nabinhait
|
ffd57a0565
|
Fix for company in chart of accounts
|
2014-07-24 10:40:18 +05:30 |
|
Anand Doshi
|
d1a2ce2750
|
[minor] is_ajax check in newsletter
|
2014-07-23 12:51:17 +05:30 |
|
Rushabh Mehta
|
3c78ab5841
|
[email digest] [fix] [hot] only open to-do items
|
2014-07-23 10:19:31 +05:30 |
|
Anand Doshi
|
de85a3af15
|
Newsletter: Bulk Send via worker
|
2014-07-22 19:49:16 +05:30 |
|
Anand Doshi
|
cb86d597b7
|
Report: Trial Balance
|
2014-07-22 19:49:16 +05:30 |
|
Nabin Hait
|
9df4196597
|
Merge pull request #1970 from ankitjavalkarwork/payrec
Added Payment Reconciliation to list accounts.py
|
2014-07-22 18:24:58 +05:30 |
|
ankitjavalkarwork
|
87633d6be6
|
Payment Reconciliation Feature/Tool - Patch
|
2014-07-22 18:14:30 +05:30 |
|
ankitjavalkarwork
|
b5ae643b6e
|
Payment Reconciliation Feature/Tool - minor change
|
2014-07-22 15:26:04 +05:30 |
|
ankitjavalkarwork
|
b0cffac79d
|
Payment Reconciliation Feature/Tool - add in module list
|
2014-07-22 15:02:59 +05:30 |
|
nabinhait
|
b5f9b5de45
|
PP Tool: data for required raw materials
|
2014-07-22 11:38:15 +05:30 |
|
nabinhait
|
c772b3d86a
|
Purchase invoice: Copy project name from first row on addition of row
|
2014-07-22 11:38:14 +05:30 |
|
nabinhait
|
7d7123de37
|
Merge branch 'ankitjavalkarwork-wip_payrec' into develop
|
2014-07-21 19:23:20 +05:30 |
|
nabinhait
|
97ab902895
|
payment reconciliation fixes
|
2014-07-21 19:22:02 +05:30 |
|
Anand Doshi
|
6e15f675a5
|
Merge pull request #1966 from anandpdoshi/anand-july-21
Stock Entry Warehouse prefill, Item autosuggest by description
|
2014-07-21 18:25:16 +05:30 |
|
Anand Doshi
|
67ecce695d
|
[fix] Show against account in General Ledger Print Format
|
2014-07-21 18:13:05 +05:30 |
|
Anand Doshi
|
4c5d7617fb
|
[minor] Update if missing, source and target warehouse in stock entry detail table, when they are specified in the form
|
2014-07-21 18:02:22 +05:30 |
|
Anand Doshi
|
7fcb3c9865
|
[minor] Item query - search by description
|
2014-07-21 17:51:32 +05:30 |
|
Pratik Vyas
|
649d18c4f7
|
[minor] fix server error for new production order if sales order is invalid
|
2014-07-21 17:17:59 +05:30 |
|
Nabin Hait
|
cbf0cb7de7
|
Merge pull request #1955 from anandpdoshi/financial-statements
Balance Sheet and Profit and Loss Statement
|
2014-07-21 16:44:46 +05:30 |
|
Anand Doshi
|
5f0459c321
|
Fixes to Financial Statements
|
2014-07-21 16:13:06 +05:30 |
|
ankitjavalkarwork
|
4dfe19e613
|
Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec
|
2014-07-21 14:23:52 +05:30 |
|
Rushabh Mehta
|
1c6313679b
|
Update material_request.js
|
2014-07-21 13:08:49 +05:30 |
|
Anand Doshi
|
f457bce0e7
|
Changed localize_date to formatdate
|
2014-07-21 12:03:04 +05:30 |
|
Anand Doshi
|
6cc5babd2e
|
Use include directive to embed common print format
|
2014-07-21 11:43:19 +05:30 |
|
Anand Doshi
|
db4ba39824
|
Better handling of ignore zero values
|
2014-07-21 11:43:19 +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
|
fa576a22e3
|
Balance Sheet
|
2014-07-21 11:43:18 +05:30 |
|
Anand Doshi
|
059f1e09a8
|
Balance Sheet - first cut
|
2014-07-21 11:43:18 +05:30 |
|
nabinhait
|
b1e7bf16ba
|
Translate while creating India specific accounts
|
2014-07-19 17:56:43 +05:30 |
|
nabinhait
|
711e8bec3d
|
Fixes overflow tolerance
|
2014-07-19 17:00:15 +05:30 |
|
nabinhait
|
b1c5738a67
|
Fixes overflow tolerance
|
2014-07-19 16:53:45 +05:30 |
|
ankitjavalkarwork
|
5283e5a7d8
|
Add Payment Reconciliation Feature/Tool - JS changes1
|
2014-07-18 15:54:29 +05:30 |
|
Anand Doshi
|
d141cf7293
|
Minor fix in reorder item
|
2014-07-18 10:31:34 +05:30 |
|
nabinhait
|
d4e080be29
|
Country mandatory in company master
|
2014-07-17 19:32:12 +05:30 |
|
ankitjavalkarwork
|
84fd33ea7a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec
|
2014-07-17 19:11:07 +05:30 |
|
ankitjavalkarwork
|
87e30f68b9
|
Add Payment Reconciliation Feature/Tool - Complete
|
2014-07-17 19:10:45 +05:30 |
|
Anand Doshi
|
e8332be285
|
Merge pull request #1949 from anandpdoshi/anand-july-17
Fix in Stock Entry test case
|
2014-07-17 12:37:42 +05:30 |
|
Anand Doshi
|
fa0db761da
|
Fix in Stock Entry test case
|
2014-07-17 12:30:55 +05:30 |
|
nabinhait
|
5f2f955224
|
From date and to date in general ledger print format
|
2014-07-17 12:29:56 +05:30 |
|
nabinhait
|
e26204e61d
|
From date and to date in general ledger print format
|
2014-07-17 12:22:58 +05:30 |
|
nabinhait
|
fa1cd5faff
|
Fixed root type of liability accounts
|
2014-07-17 11:52:50 +05:30 |
|
nabinhait
|
d16081c4d9
|
Batch no get query fix
|
2014-07-17 11:08:19 +05:30 |
|
nabinhait
|
143400d444
|
Batch no get query fix
|
2014-07-17 11:00:13 +05:30 |
|
nabinhait
|
96cb130263
|
Default letter head in general ledger and bank reco statement print
|
2014-07-17 10:56:07 +05:30 |
|
Anand Doshi
|
b8189d7d23
|
Auto Re-order Item for default warehouse only, if Warehouse wise re-order not specified
|
2014-07-16 19:24:53 +05:30 |
|