Nabin Hait
804b4acb9b
[fix] Issue fixed in C-Form related to field renaming
2015-06-11 16:56:36 +05:30
Nabin Hait
5c7557914b
Removed BOM No from mandatory from Stock Entry against Production Order
2015-06-11 16:50:35 +05:30
Nabin Hait
9bdd1aa1ed
bumped to version 5.0.21
2015-06-11 16:44:48 +06:00
Nabin Hait
1966225450
[fix] load tasks in project via __setup__ instead of onload function, to return tasks via get_doc
2015-06-11 15:31:47 +05:30
Nabin Hait
4cee27eec0
Merge pull request #3446 from anandpdoshi/anand-june-9
...
POS - search by Item Group
2015-06-10 18:42:14 +05:30
Nabin Hait
43c1a9b502
[fix] Quote url for item image in product listing page
2015-06-10 18:23:17 +05:30
Nabin Hait
b937fac3ce
[report] Warehouse column added in 'Ordered Items to be Delivered' report
2015-06-10 18:21:57 +05:30
Nabin Hait
53d94996ad
[fix] Query for Against Journal Entry
2015-06-10 18:20:18 +05:30
Anand Doshi
26f6752c1e
POS - search by Item Group
2015-06-09 16:33:46 -04:00
Nabin Hait
bb429745c0
[fix] Blank option in naming series
2015-06-09 18:59:51 +05:30
Nabin Hait
909f0c38f1
[report][enhancement] Payment period based on invoice date: show party columns and filter based on party
2015-06-09 18:42:52 +05:30
Nabin Hait
a790ba05f4
[fix] Item name, description should not be overwritten on saving of stock entry
2015-06-09 18:42:52 +05:30
Nabin Hait
17452a1695
bumped to version 5.0.20
2015-06-09 16:26:20 +06:00
Neil Trini Lasrado
5d288e407c
item variants patch removed
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
f64fae752f
fixes
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
82763f052f
Status Indicators fixed in Material Request List
2015-06-09 15:46:57 +05:30
Neil Trini Lasrado
d015195617
fixes in barcode
2015-06-09 15:21:50 +05:30
Neil Trini Lasrado
b2f550ccb3
Barcode added to Purchase Receipt
2015-06-09 15:18:58 +05:30
Anand Doshi
ec60ebde6f
[fix] Close assignment (ToDo) when Task status is changed to Closed
2015-06-08 12:48:11 -04:00
Nabin Hait
dc76b3fa20
bumped to version 5.0.19
2015-06-08 15:15:13 +06:00
Nabin Hait
828cbee12a
Merge pull request #3429 from neilLasrado/quality-inspection
...
Get Item Details in Quality Inspection.
2015-06-08 14:24:11 +05:30
Nabin Hait
686ef8308a
Show item name in item grid view based 'In List View' property
2015-06-08 14:22:56 +05:30
Nabin Hait
b63ad44b10
Book in round-off account upto max 0.05
2015-06-08 14:15:12 +05:30
Nabin Hait
5ef121bc10
get party details only if party exists
2015-06-08 14:15:11 +05:30
Neil Trini Lasrado
42c1836db5
function changed to add fetch
2015-06-08 13:09:11 +05:30
Neil Trini Lasrado
9dbdef3bd5
added code to fetch item name and desc on change of item code
2015-06-08 12:29:12 +05:30
Nabin Hait
000835c454
[fix] Fiscal year issue due to missing field in Material Request
2015-06-08 12:10:43 +05:30
Nabin Hait
7cbd916b00
[fix] Fiscal year issue due to missing field in Material Request
2015-06-08 12:06:33 +05:30
Nabin Hait
56fcf30cb9
[Patch] Update material transferred for manufacturing for existing entries
2015-06-05 18:21:35 +05:30
Nabin Hait
ebbdd772a9
[fix] Validate and update manufactured qty in Stock Entry
2015-06-05 18:21:35 +05:30
Pratik Vyas
4599467939
bumped to version 5.0.18
2015-06-05 16:26:49 +06:00
Nabin Hait
6bf301f53c
Show item description in grid view based on 'In List View' property
2015-06-05 15:49:25 +05:30
Nabin Hait
27d7f21553
[fix] pos profile link in Start POS page
2015-06-05 15:09:44 +05:30
Nabin Hait
8f87cff4bd
Merge pull request #3411 from nabinhait/develop
...
journal entry against expense claim and bank reco
2015-06-05 14:31:23 +05:30
Neil Trini Lasrado
39669f2717
operation made non mandatory in time log
2015-06-05 12:17:46 +05:30
Nabin Hait
3c1017c43b
Removed deprecated page users
2015-06-05 12:15:01 +05:30
Nabin Hait
0b18a2d347
Reset values in tools like Payment Tool
2015-06-05 12:01:29 +05:30
Nabin Hait
6262496e70
[fix] item test case
2015-06-03 18:33:47 +05:30
Nabin Hait
c9963f1805
[fix] journal entry against expense claim: pending amount validation
2015-06-03 18:01:09 +05:30
Nabin Hait
8a2b1bcb97
[fix] bank reconciliation: fetch journal entry order by posting date asc
2015-06-03 18:01:09 +05:30
Pratik Vyas
cf89fa2253
bumped to version 5.0.17
2015-06-03 18:13:38 +06:00
Nabin Hait
2c214e0362
[fix][patch] force reload web-form-field in portal fixes patch
2015-06-03 17:42:12 +05:30
Nabin Hait
7d04dd0bfd
Merge pull request #3408 from williamjmorenor/patch-1
...
Update Chart of Account for Nicaragua
2015-06-03 17:17:09 +05:30
Nabin Hait
995a78421a
[fix] Stock analytics report fixed for fifo stack related to stock reco
2015-06-03 16:44:26 +05:30
Nabin Hait
352187bee6
purchase register fix
2015-06-03 12:06:19 +05:30
Nabin Hait
c6d8121f4a
delete fields inline description
2015-06-03 11:24:37 +05:30
Nabin Hait
030ade428b
dont reset company on deleting company transactions
2015-06-03 11:24:37 +05:30
Nabin Hait
c87595b2da
show item description in item grid view if marked for 'In List View'
2015-06-03 11:24:37 +05:30
Nabin Hait
42f2674cba
dynamic link in quotation item
2015-06-03 11:24:37 +05:30
Nabin Hait
5359f2651a
[fix] sales register report
2015-06-03 11:24:37 +05:30
William Moreno
42dcffdad4
Update Chart of Account for Nicaragua
...
Hi
The Law 891 reform some taxes rates, please update the Chart of Account for Nicaragua so it can reflect the new tax rates.
2015-06-02 16:48:47 -06:00
Anand Doshi
f7c1743b28
[hotfix] cart - get_address_docs
2015-06-02 15:20:25 -04:00
Anand Doshi
64aa6620be
[hotfix] portal fixes patch
2015-06-02 11:53:17 -04:00
Rushabh Mehta
ed43f8015c
[lang] let locale be en in setup wizard (?)
2015-06-02 12:31:03 +05:30
Rushabh Mehta
d3fe7ec858
[cleanup] customer not buying since long time report
2015-06-02 12:21:17 +05:30
Rushabh Mehta
c8b406d050
[fix] duplicate status for Submitted, Cancelled
2015-06-02 12:17:14 +05:30
Rushabh Mehta
2aa577f110
[hot] patch-fix
2015-06-02 11:12:25 +05:30
Pratik Vyas
74b2116adb
bumped to version 5.0.16
2015-06-02 11:15:28 +06:00
Rushabh Mehta
2204d0af94
Merge pull request #3397 from rmehta/portal-fixes
...
Portal fixes
2015-06-02 10:42:59 +05:30
Pratik Vyas
b8a568765d
Update translations
2015-06-01 23:49:15 +05:30
Rushabh Mehta
cf29f6468d
[minor] add attachment to issue via portal:
2015-06-01 17:47:03 +05:30
Rushabh Mehta
aded46d33e
[fix] product search in new block header_actions
2015-06-01 17:23:42 +05:30
Pratik Vyas
e5fa5e6111
bumped to version 5.0.15
2015-06-01 17:47:46 +06:00
Rushabh Mehta
a33d468d30
[fixes] portal, issues, addresses etc
2015-06-01 17:15:42 +05:30
Nabin Hait
e481a211b1
item table print template
2015-06-01 17:12:55 +05:30
Nabin Hait
11190268ab
[fix][patch] GL Entries for Journal Entries with multiple Party, merge entries considering party
2015-06-01 16:21:25 +05:30
Nabin Hait
a19150ddaf
default account's custom query in company
2015-06-01 15:32:57 +05:30
Nabin Hait
c17dff4b01
default account's custom query in company
2015-06-01 15:32:57 +05:30
Pratik Vyas
8f25402dce
bumped to version 5.0.14
2015-06-01 15:21:17 +06:00
Nabin Hait
3ebfad7115
minor fixes
2015-06-01 14:01:56 +05:30
Nabin Hait
c7ef8dda79
[fix] Pricing Rule based on qty
2015-06-01 14:01:56 +05:30
Nabin Hait
4a6c178795
On selection of item, set default qty as 1
2015-06-01 14:01:56 +05:30
Nabin Hait
8908543a9c
In standard print format, item name will now honour 'Print Hide' property
2015-06-01 14:01:56 +05:30
Rushabh Mehta
065badc54b
[minor] move buttons from sales invoice to toolbar
2015-05-31 10:36:47 +05:30
Rushabh Mehta
2c30acdcb2
[minor] journal entry, copy over party details to new row and automatically set difference
2015-05-29 16:33:36 +05:30
Rushabh Mehta
4a4a6594d1
[minor] [refactor]
2015-05-29 15:56:40 +05:30
Pratik Vyas
587dde0044
bumped to version 5.0.13
2015-05-29 14:55:23 +06:00
Pratik Vyas
b6d13ef5b7
Add changelog
2015-05-29 14:24:39 +05:30
Rushabh Mehta
a3e9dbbcc3
Merge pull request #3374 from nabinhait/develop
...
Make gl entry for rounded-off amount
2015-05-29 14:20:20 +05:30
Pratik Vyas
1749406514
bumped to version 5.0.12
2015-05-29 14:47:15 +06:00
Rushabh Mehta
99b18224f5
[minor] remove order_by in listview, let user customize
2015-05-29 12:48:24 +05:30
Rushabh Mehta
b0b446e899
[fix] cleanup tables from description and re-sync print format
2015-05-29 12:44:33 +05:30
Nabin Hait
80069a6379
Book gl entry automatically due to rounding loss with test cases
2015-05-29 10:39:09 +05:30
Nabin Hait
98c515fe7d
replace 'entries' by 'items' in custom print formats and scripts
2015-05-29 10:39:09 +05:30
Nabin Hait
6ee8c545e3
[fix] gross profit report
2015-05-29 10:39:09 +05:30
Nabin Hait
3c67146e4b
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +05:30
Nabin Hait
e2c200a91e
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +05:30
Nabin Hait
d9d5925f14
[fix] BOM item validation in lower case
2015-05-29 10:39:09 +05:30
Anand Doshi
1b6c3f1a39
[fix] selenium test and changed Creation Document No to a Dynamic Link
2015-05-28 23:06:38 -04:00
Pratik Vyas
31d9d9f561
bumped to version 5.0.11
2015-05-28 14:44:58 +06:00
Rushabh Mehta
e715572e7c
Merge pull request #3373 from pdvyas/issue-perms
...
[fix] Remove guest perms from Issue
2015-05-28 14:04:21 +05:30
Pratik Vyas
d138b06c8e
Add changelog for v5.0.11 release
2015-05-28 14:00:24 +05:30
Pratik Vyas
37ee57c211
[fix] Remove guest perms from Issue
2015-05-28 13:04:43 +05:30
Rushabh Mehta
95b995be6d
[minor] set timezone in posting time and added help
2015-05-28 12:10:55 +05:30
Nabin Hait
86e479f908
Merge pull request #3355 from rmehta/purchase-invoice-fixes
...
[minor] remove letter head / terms from purchase invoice, fixes #3328 , #3345
2015-05-28 11:19:22 +05:30
Rushabh Mehta
c185734bf3
[minor] remove letter head / terms from purchase invoice, fixes #3328 , #3345
2015-05-28 11:17:22 +05:30
Rushabh Mehta
beb7c346ea
[fix] [cleanup]
2015-05-28 11:12:29 +05:30
Rushabh Mehta
88655890be
[fix] [refactor] pos hangs in multi-company, if company is not set
2015-05-28 11:11:25 +05:30
Nabin Hait
e7b37af525
Merge pull request #3353 from rmehta/barcode-fix
...
[fix] clear barcode from table, fixes #3320
2015-05-28 11:07:16 +05:30
Nabin Hait
10026ea85c
Merge pull request #3354 from rmehta/discount-field-relabel
...
[cleanup] rename discount and reserver warehouse #3325
2015-05-28 11:02:51 +05:30
Anand Doshi
8860b9d94d
[fix] Check if company exists in re-order item. Fixes #3365 .
2015-05-28 01:09:21 -04:00
Anand Doshi
81bded1afe
[fix] Product Search
2015-05-27 16:48:06 -04:00
Nabin Hait
54a10cd2af
patch fix
2015-05-27 16:14:10 +05:30
Pratik Vyas
f52b5ac8af
Merge pull request #3339 from rmehta/help
...
[help] added links in modules, added learn desktop module
2015-05-27 15:21:00 +05:30
Rushabh Mehta
2fd33a2f03
Merge pull request #3358 from nabinhait/develop
...
General ledger, _idx and FY in Material request
2015-05-27 15:10:51 +05:30
Rushabh Mehta
78f137890c
Merge pull request #3351 from anandpdoshi/anand-may-26-production-fixes
...
[fix] workstation fixes related to Production Order
2015-05-27 15:09:47 +05:30
Rushabh Mehta
0d79be5628
Merge pull request #3350 from anandpdoshi/anand-may-26
...
Fixes in shopping cart and website route rules
2015-05-27 15:09:09 +05:30
Pratik Vyas
fa555abbd2
Merge pull request #3344 from rmehta/download-backups
...
Download backups
2015-05-27 15:03:45 +05:30
Nabin Hait
eb00cae86c
Fiscal Year removed from Material Request
2015-05-27 13:18:09 +05:30
Nabin Hait
5b731ff73a
Fix _idx property as per renamed fields
2015-05-27 13:02:59 +05:30
Nabin Hait
5b8db3729c
[fix] General ledger print format
2015-05-27 13:02:59 +05:30
Rushabh Mehta
69fb13f229
[cleanup] rename discount and reserver warehouse #3325
2015-05-27 12:20:07 +05:30
Rushabh Mehta
c2acfc9828
[fix] clear barcode from table, fixes #3320
2015-05-27 12:01:03 +05:30
Anand Doshi
409843d768
[fix] workstation fixes related to Production Order
2015-05-26 19:13:45 -04:00
Anand Doshi
fb4e496b54
[fix] target variance sql
2015-05-26 18:15:55 -04:00
Anand Doshi
ff8a854b82
Fixes #3349 . Thanks @abelbm for reporting.
2015-05-26 18:13:28 -04:00
Anand Doshi
438b67e8b0
[fix] shopping cart - get price list for default territory if no price list is selected
2015-05-26 17:37:39 -04:00
Anand Doshi
e440914327
[fix] allow slashes in variables of website route rules
2015-05-26 17:37:09 -04:00
Pratik Vyas
e1637c4cae
bumped to version 5.0.10
2015-05-26 17:36:39 +06:00
Nabin Hait
b3fb6e1e04
Merge pull request #3342 from rmehta/item-price-import-link
...
[minor] add import link in item price
2015-05-26 16:51:51 +05:30
Nabin Hait
d4c8dc2915
multiple minor fixes
2015-05-26 16:32:30 +05:30
Rushabh Mehta
d51cf79fe2
[enhancement] list backups for download
2015-05-26 15:19:27 +05:30
Rushabh Mehta
306c49f8a0
[enhancement] list backups for download
2015-05-26 15:14:58 +05:30
Rushabh Mehta
c7cfa270cd
[minor] add import link in item price
2015-05-26 14:07:05 +05:30
Nabin Hait
878a18528c
Added BOM Browser link in Manufacturing home page
2015-05-26 12:41:25 +05:30
Rushabh Mehta
5fa6c4ce21
[enhancement] add bom tree view
2015-05-26 12:41:25 +05:30
Nabin Hait
b8ad56f819
Merge pull request #3336 from rmehta/ask-password-before-delete
...
[minor] re-verify password before deleting company transactions
2015-05-26 12:20:55 +05:30
Nabin Hait
b3a142f5ab
[fix] email footer and signature
2015-05-26 12:15:39 +05:30
Nabin Hait
1f5b21673c
minor fix in report
2015-05-26 12:15:39 +05:30
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
Rushabh Mehta
314af94737
[minor] added multiple commit in bom
2015-05-26 12:15:39 +05:30
Rushabh Mehta
6771240471
[help] added links in modules, added learn desktop module
2015-05-25 18:31:08 +05:30
Pratik Vyas
ac9c2de8b9
bumped to version 5.0.9
2015-05-25 17:02:12 +06:00
Nabin Hait
2c6705ef83
Merge pull request #3322 from nabinhait/test_case
...
Test case
2015-05-25 16:19:03 +05:30
Nabin Hait
63e431a219
minor fixes
2015-05-25 16:15:39 +05:30
Nabin Hait
e2787cf2ec
[fix] unique employee id validation for sales person
2015-05-25 15:27:40 +05:30
Nabin Hait
c4fa74f51d
sales partner field added in sms center
2015-05-25 15:17:29 +05:30
Nabin Hait
b62068f784
removed debug
2015-05-25 14:46:12 +05:30
Nabin Hait
43539673cc
[fix] sales person wise transaction summary
2015-05-25 14:13:03 +05:30
Nabin Hait
4809d36fbe
validate fields value with reference docs
2015-05-25 14:13:03 +05:30
Nabin Hait
f61f76ba45
[fix] gross profit report
2015-05-25 14:13:03 +05:30
Nabin Hait
8d76d14614
reset item's default accounts, warehouses on deletion of company
2015-05-25 14:13:03 +05:30
Nabin Hait
adc830b712
[fix] rename company abbr
2015-05-25 14:13:03 +05:30
Rushabh Mehta
ed618f284b
[minor] re-verify password before deleting company transactions
2015-05-25 12:20:44 +05:30
Rushabh Mehta
c4d38e2183
[minor] setup wizard language fix and no submit messages for gl/sl entry
2015-05-25 11:29:37 +05:30
Nabin Hait
fe8d107731
stock entry: get item details
2015-05-22 18:04:44 +05:30
Nabin Hait
e2968e9893
minor fixes in test cases
2015-05-22 17:25:55 +05:30
Nabin Hait
fd4bcd855b
test case fixes
2015-05-22 16:55:55 +05:30
Nabin Hait
2eba53f763
test case fixes
2015-05-22 16:55:55 +05:30
Pratik Vyas
08e04ef01a
bumped to version 5.0.8
2015-05-22 17:22:25 +06:00
Nabin Hait
1d08304ba5
added total row in stock balance report
2015-05-22 11:56:13 +05:30
Nabin Hait
3b0adc5246
[fix] ignore share permission while creating events on the background
2015-05-21 16:51:37 +05:30
Nabin Hait
4888a5dc0d
[patch][fix] party model - create debtors and creditors only if parent account exists
2015-05-21 16:51:37 +05:30
Pratik Vyas
8c6ff9ddad
bumped to version 5.0.7
2015-05-21 16:04:34 +06:00
Rushabh Mehta
3bc3384bc4
[minor] remove section headings
2015-05-21 15:06:51 +05:30
Pratik Vyas
37307215d0
Merge pull request #3315 from nabinhait/develop
...
update operation description patch
2015-05-21 14:58:24 +05:30
Nabin Hait
9895aba42e
update operation description patch
2015-05-21 14:43:24 +05:30
Neil Trini Lasrado
753e40b4d5
fixes in validation for item varients
2015-05-21 14:38:58 +05:30
Nabin Hait
e372fb11ea
naming series fix
2015-05-21 14:27:20 +05:30
Nabin Hait
4c924bb76c
totals etc should not be clickable
2015-05-21 13:38:03 +05:30
Nabin Hait
de7b87ee3a
[fix] operations and bom
2015-05-21 13:24:49 +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
Nabin Hait
4a929d53bc
Merge pull request #3310 from neilLasrado/item-var-validation
...
validation added to item varients
2015-05-21 13:21:21 +05:30
Nabin Hait
7f8d6b6252
Merge pull request #3303 from rmehta/letter-head-in-stock-entry
...
[enhancement] letter head in stock entry #3291
2015-05-21 13:20:26 +05:30
Nabin Hait
6789680fa3
Merge pull request #3302 from rmehta/fix-report-strings
...
[fix] totals etc should not be clickable
2015-05-21 13:18:22 +05:30
Nabin Hait
4f3f5308e3
Merge pull request #3301 from rmehta/issue-form-layout
...
[usability] re-layout Issue Form #3218
2015-05-21 13:15:38 +05:30
Nabin Hait
9e38d29df7
Merge pull request #3300 from rmehta/pos-setting-rename
...
[rename] POS Setting > POS Profile #3271
2015-05-21 13:14:59 +05:30
Rushabh Mehta
4984bccbc6
[fix] load taxes_and_charges only if field present
2015-05-21 12:51:07 +05:30
Neil Trini Lasrado
4258753ae8
validation added to item varients
2015-05-21 12:22:33 +05:30
Neil Trini Lasrado
68a6d61589
filter added for closed oppurtunity
2015-05-20 19:01:37 +05:30
Neil Trini Lasrado
c55edf18ad
fixes in quotation - from opportunity
2015-05-20 18:51:38 +05:30
Rushabh Mehta
a60984866c
[enhancement] letter head in stock entry #3291
2015-05-20 17:45:18 +05:30
Rushabh Mehta
555fa4fbc2
[fix] totals etc should not be clickable
2015-05-20 17:21:53 +05:30
Rushabh Mehta
43c885868f
[usability] re-layout Issue Form
2015-05-20 16:47:45 +05:30
Pratik Vyas
38937ecd3c
bumped to version 5.0.6
2015-05-20 17:05:40 +06:00
Rushabh Mehta
9624bac3cf
[fix] create SMS Log
2015-05-20 15:48:58 +05:30
Rushabh Mehta
a27cca97b5
[rename] POS Setting > POS Profile #3271
2015-05-20 15:43:17 +05:30
Nabin Hait
521aa2e94a
Update party_model.py
2015-05-20 14:39:39 +05:30
Nabin Hait
a2d8585b07
party model patch fix
2015-05-20 14:32:54 +05:30
Pratik Vyas
10e813b010
bumped to version 5.0.5
2015-05-20 13:24:52 +06:00
Nabin Hait
a7bd8ee34b
Update utils.py
2015-05-20 12:53:04 +05:30
Pratik Vyas
8980ce6052
bumped to version 5.0.4
2015-05-20 12:57:47 +06:00
Nabin Hait
8d50eb32c1
validate diabled fiscal year
2015-05-20 12:26:21 +05:30
Nabin Hait
0cf9469f86
validate disabled fiscal year
2015-05-19 18:44:02 +05:30
Pratik Vyas
07b3bf6417
bumped to version 5.0.3
2015-05-19 18:03:00 +06:00
Nabin Hait
8252117fe5
set tax amount also in base currency after manipulation
2015-05-19 16:30:17 +05:30
Nabin Hait
c602396366
validation message improved
2015-05-19 16:30:16 +05:30
Nabin Hait
f59d3a4e07
conversion rate fixes
2015-05-19 16:30:16 +05:30
Pratik Vyas
80a116ab19
bumped to version 5.0.2
2015-05-19 16:15:57 +06:00
Nabin Hait
6684c470c5
Merge pull request #3287 from rmehta/customer-fix
...
Customer fix
2015-05-19 15:33:06 +05:30
Pratik Vyas
b8252bca00
bumped to version 5.0.1
2015-05-19 13:47:43 +06:00
Pratik Vyas
129a0a4cae
Fix merge mistakes
2015-05-19 13:12:00 +05:30
Pratik Vyas
803e998e9d
Fix merge mistakes
2015-05-19 13:08:54 +05:30
Rushabh Mehta
476019a930
[fix] throw name error for duplicate group
2015-05-19 13:03:01 +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
Pratik Vyas
cc8f204b50
bumped to version v5.0.0
2015-05-19 12:33:57 +06:00
Nabin Hait
fcda5b636c
patch fix
2015-05-19 11:12:06 +05:30
Nabin Hait
fb7140df2f
Don't repost future sle while cancelling PR via landed cost voucher
2015-05-19 11:12:06 +05:30
Nabin Hait
0a705fe582
gross profit report fix
2015-05-19 11:12:06 +05:30
Rushabh Mehta
4a3c805049
[fix] sms settings, fixes #3276
2015-05-19 11:10:12 +05:30
Rushabh Mehta
632fb3879e
[fix] sms center, fixes #3274
2015-05-19 11:00:10 +05:30
Rushabh Mehta
df2491f6cf
[fix] default website fixes #3273
2015-05-19 10:47:10 +05:30
Rushabh Mehta
7231bd76a2
[minor] [fix] default status in Purchase Receipt
2015-05-18 14:36:57 +05:30
Rushabh Mehta
770c258406
[test-fix] case
2015-05-18 12:43:46 +05:30
Rushabh Mehta
ba57d7c59b
[test-fix] case
2015-05-18 12:37:11 +05:30
Rushabh Mehta
5b69a93871
[test-fix] circular reference
2015-05-18 12:15:35 +05:30
Rushabh Mehta
49765b3009
[minor] catch naming series while setting type
2015-05-18 11:35:52 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Rushabh Mehta
0718292bfa
[minor] naming series not set message
2015-05-18 11:19:10 +05:30
Nabin Hait
26c8a96b0a
set contact and customer in issue
2015-05-17 10:39:06 +05:30
Nabin Hait
1fe50120a3
minor fix
2015-05-16 12:14:54 +05:30
Rushabh Mehta
3d7793dae3
[hot] fix in issue
2015-05-15 20:59:19 +05:30
Nabin Hait
f78283fbff
customer and supplier dashboard info
2015-05-15 16:58:51 +05:30
Nabin Hait
b893972486
update tax amount after discount amount in purchase cycle
2015-05-15 15:16:30 +05:30
Nabin Hait
53ba64b653
fix update_projects patch
2015-05-15 15:16:30 +05:30
Pratik Vyas
4cf549d223
bumped to version 4.25.7
2015-05-15 14:46:26 +06:00
Rushabh Mehta
8360e2df71
[fix] [minor] update customer in issue fixes #3241
2015-05-15 14:09:23 +05:30
Rushabh Mehta
e2e1471f4d
[fix] fix breadcrumbs for sales browser fixes #3240
2015-05-15 14:05:10 +05:30
Rushabh Mehta
0eb2dae5d1
[fix] opportuniy fixes #3262
2015-05-15 13:51:35 +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
9f926080b6
minor fix in reports
2015-05-15 10:44:19 +05:30
Pratik Vyas
9726447169
Update translations
2015-05-14 15:14:06 +05:30
Nabin Hait
60ca1c2e87
Customer Addresses And Contacts report
2015-05-14 12:32:26 +05:30
Nabin Hait
90fc19ed9a
Item image in print view
2015-05-14 12:32:26 +05:30
Nabin Hait
2f243f4d08
Merge pull request #3242 from neilLasrado/crm
...
view leads button added to campaign
2015-05-13 19:34:36 +05:30
Nabin Hait
fb6f79d345
Merge pull request #3228 from neilLasrado/hr
...
Minor Fixes for HR
2015-05-13 19:33:46 +05:30
Nabin Hait
13fce8fc3a
Merge pull request #3152 from neilLasrado/project
...
Relative Dates for Tasks - WIP
2015-05-13 19:33:20 +05:30
Neil Trini Lasrado
58bf6c5950
Update task.py
2015-05-13 19:29:47 +05:30
Nabin Hait
e6e456b373
message fixed
2015-05-13 17:21:44 +05:30
Nabin Hait
96c4252762
reload account in patch
2015-05-13 14:55:12 +05:30
Nabin Hait
f6e4723101
minor fix in landed cost voucher
2015-05-13 12:53:11 +05:30
Nabin Hait
7a9646959a
Allowed purchase order in different uom than in Material request
2015-05-13 12:42:29 +05:30
Pratik Vyas
119c4cf176
bumped to version 4.25.6
2015-05-13 12:24:39 +06:00
Nabin Hait
b45d4e0e16
In general ledger report opening amount is purely based on posting date
2015-05-12 17:40:14 +05:30
Nabin Hait
6c0c5702c5
patch fix : replace fields in print formats and custom scripts
2015-05-12 16:49:40 +05:30
Nabin Hait
4ed40be3c2
remove toggling SO and DN field in SI based on pos
2015-05-12 15:26:45 +05:30
Nabin Hait
2d76825936
remove toggling SO and DN field in SI based on pos
2015-05-12 15:24:55 +05:30
Nabin Hait
4b9b92ba2f
minor fix in report
2015-05-12 15:12:30 +05:30
Nabin Hait
ffc7f3fef6
Apply default taxes on loading of document
2015-05-12 15:07:02 +05:30
Nabin Hait
23d6eb7e5c
patch fixed for making email acocounts
2015-05-12 15:02:33 +05:30
Nabin Hait
8ba849184f
Fix taxes and totals in party currency
2015-05-12 12:50:43 +05:30
Nabin Hait
8719c1a6b8
Fix taxes and totals in party currency
2015-05-12 12:28:26 +05:30
Rushabh Mehta
73249551e8
[fix] [hot] website product list make full urls
2015-05-12 11:37:47 +05:30
Rushabh Mehta
9cf1edc2c0
[fix] [hot] website product list make full urls
2015-05-12 11:32:25 +05:30
Rushabh Mehta
8f96c39be6
[minor] setup wizard via error report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
92015a1268
[fix] [minor] escape in report
2015-05-12 11:32:25 +05:30
Rushabh Mehta
4f1a7e5aa8
[fix] newsletter list duplicate
2015-05-12 11:32:25 +05:30
Nabin Hait
ec361ea648
exchange rate fix
2015-05-11 18:14:45 +05:30
Neil Trini Lasrado
6c85479e4f
view leads button added to campaign
2015-05-11 17:56:36 +05:30
Nabin Hait
dd82bf2ad9
Exchange rate issue fixed
2015-05-11 16:49:31 +05:30
Pratik Vyas
3d77de9cf9
[fix] rename table fieldnamess patch
2015-05-11 16:08:14 +05:30
Nabin Hait
fedcb242ef
Rename table fieldnames only if doctype exists
2015-05-11 15:11:17 +05:30
Nabin Hait
affb3ec220
Item variants: validation added
2015-05-11 15:11:17 +05:30
Neil Trini Lasrado
2edc91bc52
Leave Type - LWP changed to Leave Without Pay
2015-05-11 14:38:21 +05:30
Neil Trini Lasrado
ec2f3d6e63
leave_allocation layout changed
2015-05-11 14:38:20 +05:30
Pratik Vyas
2fb0654f97
Show bulk limit error before sending
2015-05-11 14:29:52 +05:30
Rushabh Mehta
4439493232
[welcome-mails] add video links
2015-05-11 12:52:36 +05:30
Nabin Hait
93e0ec6663
Show only sub-contracted purchase order in stock entry for subcontracting
2015-05-11 11:32:38 +05:30
Nabin Hait
d1a64d89be
date issue fixed serial no
2015-05-11 11:32:38 +05:30
Nabin Hait
8f5b8c658a
fixes for renaming taxes and charges master
2015-05-11 11:32:38 +05:30
Rushabh Mehta
20a41b52cd
[temp-fix] missing product image
2015-05-09 12:18:17 +05:30
Nabin Hait
6752b31091
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:49:50 +05:30
Nabin Hait
e27690ceda
Fixed issue while updating Requested Qty on stoping material request and patch to recalculate
2015-05-08 12:43:10 +05:30
Rushabh Mehta
ab1ed013b3
[hot] taxes
2015-05-08 11:09:25 +05:30
Nabin Hait
15c284497b
fixed patch
2015-05-08 01:28:01 +05:30
Nabin Hait
fbdc0dc7d1
fixed patch
2015-05-08 01:24:28 +05:30
Nabin Hait
752479d08d
patch order changed
2015-05-08 01:15:39 +05:30
Nabin Hait
53f17009bc
Merge pull request #3215 from neilLasrado/prod-order
...
Production Order - Fixed cost not considering qty issue
2015-05-07 18:55:02 +05:30
Neil Trini Lasrado
3c3cdc7029
fixes
2015-05-07 18:52:12 +05:30
Pratik Vyas
7e143a5fdd
bumped to version 4.25.5
2015-05-07 19:00:37 +06:00
Rushabh Mehta
55dc66ffcc
[fix] index for sales order item
2015-05-07 18:16:49 +05:30
Neil Trini Lasrado
20e1c781b6
js call changed to trigger
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
a10bdd4980
fixes
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
e64d453d09
patch added
2015-05-07 17:31:59 +05:30
Neil Trini Lasrado
4f5cc9d672
Test case added to Production Order to check planned-operating-cost against qty
2015-05-07 17:31:24 +05:30
Neil Trini Lasrado
e63146408d
production order - fixes cost not considering qty issue
2015-05-07 17:31:24 +05:30
Nabin Hait
08c0c04ef2
Removed old page style Stock ledger end stock level report
2015-05-07 16:59:51 +05:30
Nabin Hait
c62c64c38b
patch fixed for taxes and charges template
2015-05-07 16:58:28 +05:30
Nabin Hait
28b18222c0
capacity planning patch fixed
2015-05-07 16:29:51 +05:30
Nabin Hait
574d5ff535
fetch only stock items as raw materials supplied for subcontracting
2015-05-07 16:29:29 +05:30
Nabin Hait
4bfbd29411
Permission for Stock ledger and balance report
2015-05-07 15:41:09 +05:30
Nabin Hait
d5e2788cb4
Permission for Stock ledger and balance report
2015-05-07 15:28:21 +05:30
Rushabh Mehta
3545575c8b
[jsonrates api] add from global defaults
2015-05-07 15:16:37 +05:30
Rushabh Mehta
2682278ad9
Merge pull request #3221 from neilLasrado/hr
...
employee removed from HR setup
2015-05-07 14:59:45 +05:30
Neil Trini Lasrado
d1c413a668
employee removed from HR setup
2015-05-07 12:40:18 +05:30
Rushabh Mehta
66fa1ff878
[enhancement] automatic exchange rates via jsonrates
2015-05-07 12:26:09 +05:30
Rushabh Mehta
009378e187
[rename]
2015-05-06 22:59:00 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Neil Trini Lasrado
b4a298ddd4
multiple dependant tasks added
2015-05-06 14:47:34 +05:30
Neil Trini Lasrado
b3b373d0ac
fixes in Test Cases
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
350943128a
fixes in Pull request
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
c8f0c25088
referenceError name changed to circularReferenceError
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
1fa8ed8a1f
Test Cases Added, fixes in task
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
3da42fcdf9
fixed import errors
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
fa381c7a6c
task-rescheduling - handled exception if date is None
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
46d859e694
re-schedule dependaable task logic added
2015-05-06 14:47:33 +05:30
Neil Trini Lasrado
93583faaf0
depends-on added to task, circular reference validation added
2015-05-06 14:47:33 +05:30
Nabin Hait
a0b1124d6f
minor fix in report
2015-05-06 11:59:43 +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
40557750d5
party model patch fix
2015-05-05 16:00:21 +05:30
Nabin Hait
cf22fdbc85
party model patch fix
2015-05-05 14:22:10 +05:30
Nabin Hait
61092c0a88
Pos item view: show item name and item code
2015-05-05 12:27:11 +05:30
Rushabh Mehta
4f41bb35b9
Merge pull request #3192 from neilLasrado/purchase-costing
...
Purchase costing in Projects
2015-05-05 10:59:11 +05:30
Rushabh Mehta
deed16066e
Merge pull request #3209 from rmehta/email-threading
...
[email] changes in email_account api
2015-05-05 10:55:50 +05:30
Nabin Hait
7104cf613f
party model patch fix
2015-05-04 19:21:36 +05:30
Rushabh Mehta
82ee5fdba6
[email] changes in email_account api
2015-05-04 18:17:22 +05:30
Nabin Hait
64568fb296
Default expense account and cost center are always visible in item
2015-05-04 16:16:12 +05:30
Nabin Hait
f73aa079a0
item list view indicator fix
2015-05-04 16:06:59 +05:30
Nabin Hait
72f71836d7
Party model patch fix
2015-05-04 13:01:44 +05:30
Nabin Hait
c91a9e5231
Delete company and company transactions are separate functions
2015-05-04 11:51:21 +05:30
Rushabh Mehta
e991c9e075
[fix] [typo] fixes #3193
2015-05-04 11:04:54 +05:30
Nabin Hait
874ead2ed9
Update warehouse as per master_name if master_name exists
2015-05-04 08:53:57 +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
fb1f4a5c58
User permissions for Expense Claim
2015-05-02 18:46:29 +05:30
Nabin Hait
b0e9c06f93
Stock Entry agianst Manufaturing: fetch only stock items from bom
2015-05-02 18:46:29 +05:30
kressi
d853353c28
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-02 10:24:56 +02:00
kressi
d1aa37f521
removed attributes from frappe is_website_user
2015-05-02 10:24:17 +02:00
Nabin Hait
d51b09282a
link warehouse with account
2015-05-01 20:31:11 +05:30
Pratik Vyas
ef7d6ae1f5
bumped to version 4.25.4
2015-05-01 17:12:36 +06:00
Nabin Hait
ba43afc461
fix in chart of cost centers
2015-05-01 16:41:15 +05:30
Nabin Hait
9dd9150d2c
fix for duplicate item
2015-05-01 16:41:15 +05:30
Nabin Hait
f25822cd8d
fix in patches
2015-05-01 15:50:52 +05:30
Nabin Hait
2ca18ff913
Stock Entry validation in Journal Entry
2015-05-01 12:46:59 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Nabin Hait
7981ea0e6c
duplicate item message
2015-05-01 11:10:37 +05:30
Nabin Hait
816cb8c141
Migrate customized precision for newly created total fields
2015-05-01 11:10:37 +05:30
Anand Doshi
e6ac87e86f
Gross Profit Report: Company filter should be reqd
2015-04-30 15:33:31 -07:00
Rushabh Mehta
ec3ad7d865
[enhancement] close opportunities from list view
2015-04-30 17:17:50 +05:30
Pratik Vyas
7358e6a100
bumped to version 4.25.3
2015-04-30 17:01:02 +06:00
Nabin Hait
aa03a8e3a2
Migrate customized precision for newly created total fields
2015-04-30 16:13:47 +05:30
Nabin Hait
1bf03289a6
Service items should not be considered as raw material in production planning tool
2015-04-30 16:13:47 +05:30
Nabin Hait
c5b8f7eb46
fix in trends report
2015-04-30 16:13:46 +05:30
Nabin Hait
4ffee99ba3
Removed duplicate item validation
2015-04-30 16:13:46 +05:30
Neil Trini Lasrado
42a554e5cb
fixes in Purchase Invoice
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
01720404db
fixes in Test Cases
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
349461e9e6
Test Cases Added
2015-04-30 13:06:02 +05:30
Neil Trini Lasrado
9a56764bf2
Total Purchase Cost added to Projects
2015-04-30 13:06:02 +05:30
Rushabh Mehta
5e13799704
[fixes] leave approver selection and cleaned up layout
2015-04-30 12:55:10 +05:30
Nabin Hait
6e659a4f27
Service items should not be considered as raw material in production planning tool
2015-04-30 11:51:24 +05:30
Nabin Hait
acfdce6ade
Removed duplicate item validation
2015-04-30 11:51:24 +05:30
Nabin Hait
4716278f69
minor fix in chart of cost centers
2015-04-29 19:12:46 +05:30
Nabin Hait
2db8dc922a
fixed trial balance related to showing zero balance
2015-04-29 18:39:33 +05:30
Nabin Hait
5207d1205e
minor issue fixed for precision
2015-04-29 15:38:14 +05:30
Nabin Hait
6e59aca394
[enhancement] sort root accounts as assets, liability, equity, income, expense
2015-04-29 13:08:00 +05:30
Nabin Hait
59ab65ded6
fixed trial balance related to showing zero balance
2015-04-29 13:08:00 +05:30
Rushabh Mehta
0590cdceab
[enhancement] sort root accounts as assets, liability, equty, income, expense
2015-04-29 12:26:15 +05:30
Nabin Hait
081935eff7
[fix] fetch bank/cash account
2015-04-28 19:08:42 +05:30
Nabin Hait
2ff177a4fb
fix for opening purchase invoice
2015-04-28 17:17:37 +05:30
Nabin Hait
47e5c764c3
[fix] accounts payable report
2015-04-28 16:45:32 +05:30
Rushabh Mehta
45ca8a4d31
[minor] save last company in multi-company scenario
2015-04-28 16:04:56 +05:30
Nabin Hait
b1b95526c6
Update sales_invoice.js
2015-04-28 13:56:48 +05:30
Nabin Hait
872eaf1541
Update purchase_invoice.js
2015-04-28 13:56:17 +05:30
Nabin Hait
aef76bfa1d
Update journal_entry.js
2015-04-28 13:55:04 +05:30
Nabin Hait
042f86e555
advance paid should not be copied and patch to fix affected records
2015-04-28 13:00:23 +05:30
Nabin Hait
67fdbcf242
precision fixed in batch-wise balance report
2015-04-28 12:53:26 +05:30
Nabin Hait
5ce31174be
precision fixed in batch-wise balance report
2015-04-28 12:36:53 +05:30
Nabin Hait
3be69d4d81
patch for updating temporary account type
2015-04-27 18:33:05 +05:30
Nabin Hait
5616ff417c
Account type Temporary and removed Aging Date field from all documents
2015-04-27 18:08:51 +05:30
Pratik Vyas
b17f056f8d
bumped to version 4.25.2
2015-04-27 17:59:52 +06:00
Rushabh Mehta
50ce9753e0
[minor] added cache in get_value
2015-04-27 13:13:50 +05:30
Nabin Hait
3c3855ac8c
advance paid should not be copied and patch to fix affected records
2015-04-27 11:25:56 +05:30
Anand Doshi
8be3ba36d9
fixed relative urls in some web pages
2015-04-24 13:22:08 -04:00
Nabin Hait
9c8b6eb815
minor fix in completed production orders report
2015-04-24 18:36:02 +05:30
Nabin Hait
52cf6e947c
patch fix
2015-04-24 16:07:32 +05:30
Rushabh Mehta
6894b9e457
[minor] only one Temporary Opening account
2015-04-24 14:22:54 +05:30
Nabin Hait
01e4c8f0f8
fix in chart of accounts
2015-04-23 16:29:15 +05:30
Rushabh Mehta
a30c76f430
[ux] [layouts] project page
2015-04-23 15:23:47 +05:30
Nabin Hait
218a1267c9
Merge pull request #3146 from neilLasrado/project
...
FIxes - Time Log Hours calculation
2015-04-23 14:37:23 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Neil Trini Lasrado
8e4cf13d01
fixes time log hours calculation
2015-04-22 16:23:36 +05:30
Neil Trini Lasrado
d3179a733b
datatype of hour_rate in Production order operations and bom operation changed to float
2015-04-22 16:11:48 +05:30
Neil Trini Lasrado
6a066e07e5
Time Log - to_time trigger called on_load to calculate hours if Tl is created via Calender
2015-04-22 16:11:48 +05:30
Nabin Hait
4669fe3e85
minor fix
2015-04-22 15:34:44 +05:30
Neil Trini Lasrado
ecb5d11e2d
Today added as default date for posting date in expense claim
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
051d0ab79a
function name validate cost changed to update cost in Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72
fixes in Expense Claim and get_avtivity_cost function
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
832dfe7980
fixes in Time Log Batch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
086c0463be
Fixes in Patch
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e1951306eb
fix in time log batch list
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
da8c6f6ae2
test case fix for Time Log
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
50a0fd6204
feild rename fixes in Project
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
e7ddb72e7f
patch for renaming project feilds
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4cffbe26dc
rate removed from time log batch
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
d4b33d3c14
Costing added in Time log Batch, Sales Order added to Project + more fixes
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4
filters added, ui change, update project moved to project.py
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
ec5c66f8f0
Title Feild added to Expense Claim
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88
fixes in Test Cases
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
9789d06b3e
task and project- billing amount and actual amount added
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
650e679a5e
Fixes in Project
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
78b96ca769
Fixes in time_log
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
c33ad6b36a
fixes in Activity Cost
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
2679b247b3
fixes in Expense Claim
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
7f9ea3bf6a
expense claim test records
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
33d58ac431
Test Cases
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
709c43674b
feild rename - internal rate/cost into costing rate/amount
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
aabf150423
task made mandatory in project
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f
in Time Log - Server side validations added to recalculate cost on save
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe
Task added to expense claim
...
all cost (expense claim and time log) against Task; task updates project cost.
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
8026137998
employee name added to activity cost
...
title changed for activity type
time log -fetch logic added for billing and internal rate
validations and calculation logic added
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0
New Document Activity Cost created.
...
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
2015-04-22 11:25:57 +05:30
Neil Trini Lasrado
d93750a868
Manufacturing Settings - Datatype of capacity_planning_for_days and mins_between_operations changed to Int
2015-04-21 17:40:37 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Neil Trini Lasrado
261e27b9ec
type of Hour rate in Production order operations and bom operations changed to currency (previouslly float). Desc to Actual Operation Cost changed
2015-04-21 16:43:43 +05:30
Nabin Hait
e68e86f109
execute on_doctype_update
2015-04-21 15:26:42 +05:30
Rushabh Mehta
50918a8fcf
[pos] fixes #3138 , #3140
2015-04-21 14:38:48 +05:30
Rushabh Mehta
4665f7eb70
[enhancement] added description, batch_no in packing slip
2015-04-21 11:20:24 +05:30
Rushabh Mehta
80381475c4
[ux] re-arranged columns in bank reconciliation, fixes #3114
2015-04-21 11:08:53 +05:30
Rushabh Mehta
dfa93305ab
[minor] fixes #3127
2015-04-21 10:36:39 +05:30
Rushabh Mehta
7f9c4d8677
[fix] item grid fix, via #3136
2015-04-21 10:19:53 +05:30
Nabin Hait
5c7f0bcb32
Party filter and columns in general ledger report
2015-04-20 17:13:53 +05:30
Rushabh Mehta
e9bd77d674
[minor] fixes in welcome mails
2015-04-20 13:00:56 +05:30
Nabin Hait
44aaa56000
get standard chart of account if country code not found
2015-04-20 11:51:54 +05:30
Pratik Vyas
dbb3b49625
bumped to version 4.25.1
2015-04-20 11:14:21 +06:00
Pratik Vyas
b78ab03b2b
Merge 'upstream/master' into v4.x.x (account receivable hotfix)
2015-04-20 10:41:31 +05:30
Rushabh Mehta
80f8b7be2f
[minor] [perms] Expense Claim Type
2015-04-19 16:18:15 +05:30
Rushabh Mehta
d7330ec709
[minor] add disabled property in fiscal year:
2015-04-18 17:04:04 +05:30
Rushabh Mehta
92b253dceb
Update accounts_receivable.py
2015-04-18 12:13:57 +05:30
Nabin Hait
1b26c6f02a
Merge pull request #3125 from nabinhait/v4.x.x
...
hotfix in patch
2015-04-17 16:16:35 +05:30
Nabin Hait
0287b1f75c
hotfix in patch
2015-04-17 16:15:25 +05:30
Pratik Vyas
e7eb92ce70
bumped to version 4.25.0
2015-04-17 16:32:11 +06:00
Nabin Hait
4743cbe002
issue fixed in accounts receivable report
2015-04-17 15:55:19 +05:30
Nabin Hait
ddaedefb32
minor fix for fieldname
2015-04-17 15:01:41 +05:30
Rushabh Mehta
9e6812cfab
Merge pull request #3108 from BhupeshGupta/fix_bank_reports
...
Add/Fix Bank Reports Filters
2015-04-17 14:17:22 +05:30
Nabin Hait
2ba88c4a5f
patch: delete gle for cancelled invoices
2015-04-17 12:05:00 +05:30
Rushabh Mehta
b092339c3a
[minor] ignore list for dropbox
2015-04-17 12:01:40 +05:30
Rushabh Mehta
0939a5ac4c
feature to delete company
2015-04-17 11:52:45 +05:30
Anand Doshi
63ea99e929
[hotfix] item group set_parent_website_route
2015-04-16 20:45:54 -04:00
Nabin Hait
1a6299176a
delete gl entries on cancellation of sales invoice, if grand total is zero
2015-04-16 19:22:42 +05:30
Nabin Hait
2029ea9abf
toggle editable price list rate
2015-04-16 17:55:35 +05:30
Nabin Hait
2182cd5487
Update journal_entry.js
2015-04-16 16:00:37 +05:30
Rushabh Mehta
acf489c5ef
[hot] [fix] journal entry
2015-04-16 15:35:49 +05:30
Rushabh Mehta
d839a730cf
[hot] [fix] journal entry
2015-04-16 15:27:46 +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
Nabin Hait
c3daa91c8a
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 13:13:18 +05:30
Rushabh Mehta
2e7c36ec99
[favicon] light grey for erpnext
2015-04-16 12:41:42 +05:30
Rushabh Mehta
600aa622b1
[fix] [minor] journal entry, via error report
2015-04-16 11:43:26 +05:30
Rushabh Mehta
12ade3573b
[minor] fix default permissions for purchase taxes and charges master
2015-04-16 11:43:25 +05:30
bhupeshg2
3f59615555
switch to tabs
2015-04-15 22:29:45 +05:30
Rushabh Mehta
2887913797
[fix] opportunity -> quotation
2015-04-15 15:40:05 +05:30
Rushabh Mehta
2dea40f7be
[leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042
2015-04-15 15:08:48 +05:30
Pratik Vyas
850ee3c53d
Fix make_email_account patch
2015-04-15 14:36:32 +05:30
Rushabh Mehta
53bc304be2
Merge pull request #3037 from neilLasrado/production-planning
...
Production planning
2015-04-15 12:06:44 +05:30
Rushabh Mehta
e027d3f34f
[fix] a better solution for #2776
2015-04-15 12:03:21 +05:30
bhupeshg2
e2e973f7be
Add reqd to bank clearance aummary report
...
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
2015-04-14 23:09:32 +05:30
Anand Doshi
68dfc934bf
[hotfix] [report] Received Items to be Billed
2015-04-14 11:56:42 -04:00
Rushabh Mehta
3ee1f11771
[cleanup] quality inspection fixes #3061
2015-04-14 17:53:36 +05:30
Rushabh Mehta
5e7f8fd156
[ux] bom fixes #3072
2015-04-14 14:24:21 +05:30
Rushabh Mehta
de9bd108d0
[usability] journal entry type fixes #3085
2015-04-14 14:10:19 +05:30
Rushabh Mehta
39539f14ce
[patch-fix] make_email_accounts
2015-04-14 13:07:28 +05:30
Neil Trini Lasrado
18dc151fc7
Fixes in make_time_log function in Production Order
2015-04-14 13:06:07 +05:30
Neil Trini Lasrado
cf96cc26a0
Fixes for test cases
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
1371afce2e
added default date to planned start date in Prod Order & made planned end date read-only
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
c43ac20115
Fixes in logic for production order scheduling
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
d3d94d1efe
fix- Material Transferred for Manufacturing not Updating in Production Order Error
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
cd1816cc5a
removed unnecesssary functions. Production related feilds made mandatory in TIme Log
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
5ab7d930b6
make time log button in Production order operations fixed
...
show time logs button made available for compleated operations
2015-04-14 13:00:54 +05:30
Neil Trini Lasrado
8d5d5cc0a7
Planned Start Date made mandatory in production order
...
server side check added to not plan operations if planned_start_date is None
Production Order on submit - unwanted error messsages problem fixed.
2015-04-14 13:00:54 +05:30
Rushabh Mehta
2c78796716
[fix] opportunity / make quotation
2015-04-14 11:24:42 +05:30
Rushabh Mehta
adfc34ba00
[opportunity] status open
2015-04-13 22:23:50 +05:30
Rushabh Mehta
f579cf9871
[opportunity] status open
2015-04-13 16:58:47 +05:30
Rushabh Mehta
4ac3094049
[opportunity] status open
2015-04-13 16:56:03 +05:30
Rushabh Mehta
c712dc6729
[opportunity] status open
2015-04-13 16:51:27 +05:30
Rushabh Mehta
99a4d63d97
[opportunity] status open
2015-04-13 16:24:35 +05:30
Rushabh Mehta
fd0f1cb8b7
[opportunity] not submittable
2015-04-13 16:21:58 +05:30
Rushabh Mehta
20bcf6aeff
[fixes] print_hide on stock uom and gross profit
2015-04-13 15:31:24 +05:30
Rushabh Mehta
39c84fe31c
[hot] coa
2015-04-13 12:16:25 +05:30
Rushabh Mehta
b4c4351513
[report] fix via error report
2015-04-13 11:30:10 +05:30
Pratik Vyas
2437d4cce2
Fix #3046 Customer Acquisition and Loyalty repor
2015-04-10 12:35:43 +05:30
Pratik Vyas
7f8cc32d38
update translations
2015-04-10 10:26:08 +05:30
Anand Doshi
a0630671da
[hotfix] batch query
2015-04-09 13:34:57 +05:30
Pratik Vyas
c95e4e89d5
bumped to version 4.24.4
2015-04-09 12:56:05 +06:00
Nabin Hait
4642d0697e
fixed conflict
2015-04-09 11:42:24 +05:30
Anand Doshi
00a07de426
fixed test earning type
2015-04-08 21:49:11 +05:30
Anand Doshi
c994647704
fixed test cases
2015-04-08 21:22:36 +05:30
Anand Doshi
2f87fb41fa
Merge pull request #3069 from neilLasrado/dob
...
validation added - dob cannot accept a future date
2015-04-08 13:25:01 +05:30
Anand Doshi
a1a3468704
Merge pull request #3068 from neilLasrado/leaves
...
Bug Fixes
2015-04-08 13:20:18 +05:30
Neil Trini Lasrado
4b29ccc2b0
Salary Structure - Earnings made mandatory
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef
fix - update button didnt work in leave allocation after submit
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515
validation added - dob cannot accept a future date
2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b
fixes in offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a
print format added
2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513
[fixes] offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2
terms view added
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168
Offer Letter - New Doctype added and job_applicant naming changed
2015-04-08 12:28:20 +05:30
Nabin Hait
0277ae298a
pending amount to be delivered in report
2015-04-07 17:49:53 +05:30
Pratik Vyas
d102cba71c
[patch] [fix] Fix missing image column error
2015-04-07 15:32:15 +05:30
Anand Doshi
e4e112a6bc
setup wizard - don't send welcome mail
2015-04-07 11:03:58 +05:30
Nabin Hait
6eb55d4d3d
allowed import for delivery note
2015-04-07 09:42:44 +05:30
Anand Doshi
03cf407574
[fix] removed print
2015-04-06 19:38:13 +05:30
Anand Doshi
c399709789
fixes to test cases
2015-04-06 19:29:16 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Anand Doshi
731b15edf4
[hotfix] taxes and totals
2015-04-05 20:09:09 +05:30
Anand Doshi
22af7deadd
minor fixes
2015-04-05 17:18:07 +05:30
Anand Doshi
7854779c22
[hotfix] strip email when importing newsletter list
2015-04-05 13:44:52 +05:30
Anand Doshi
e4580447d0
[fix] on setup wizard language selection and load, set it as system default language
2015-04-04 16:15:04 +05:30
Anand Doshi
85e5d46370
[fix] opportunity email pulling
2015-04-03 15:03:01 +05:30
Anand Doshi
c13c4f014e
[fix] editable amount in Purchase Taxes and Charges
2015-04-03 14:55:51 +05:30
Anand Doshi
432c12ad93
[fix] email account patch fix and minor setup wizard fix
2015-04-03 14:30:15 +05:30
Rushabh Mehta
8bd54f27c5
Merge pull request #3051 from rmehta/opportunity
...
Opportunity
2015-04-03 11:01:59 +05:30
Rushabh Mehta
f63a3d4a80
[fiscal year] automatically set year end date if more than one year
2015-04-03 10:59:48 +05:30
Anand Doshi
9d3adc3abf
Merge pull request #3048 from anandpdoshi/anand-april-2-v5
...
Party Model Patch
2015-04-03 08:22:59 +05:30
Rushabh Mehta
bb2041d22c
[patch] fix
2015-04-02 22:11:16 +05:30
Rushabh Mehta
7c32770a69
move opportunity item to CRM
2015-04-02 22:06:36 +05:30
Rushabh Mehta
3c626faf8f
[incoming sales email] to opportunity
2015-04-02 22:02:33 +05:30
Rushabh Mehta
4c46687fb1
[incoming sales email] to opportunity
2015-04-02 22:00:34 +05:30
Rushabh Mehta
05e39992d0
[setup-wizard] don't catch duplicate
2015-04-02 18:55:36 +05:30
Anand Doshi
5445c460b7
[fix] [patch] party model patch
2015-04-02 17:42:27 +05:30
Rushabh Mehta
750ceedbc1
[production order] explict idx + test fix
2015-04-02 16:03:11 +05:30
Rushabh Mehta
99a41952a4
[lead] [email] fixes
2015-04-02 15:53:11 +05:30
Anand Doshi
54448aabd6
Setup wizard fixes
2015-04-02 15:39:44 +05:30
Rushabh Mehta
ffc190d34d
Merge pull request #3013 from neilLasrado/expense
...
Expense Claim - 'Total Amount Reimbursed' feild added
2015-04-02 14:29:29 +05:30
Anand Doshi
83f87da3d1
Show Write-Off for all Sales Invoices if there is a Grand Total
2015-04-02 13:43:51 +05:30
Rushabh Mehta
d7a5b7309b
[minor] fix
2015-04-01 23:38:37 +05:30
Anand Doshi
bfa3a08576
fixed welcome emails
2015-04-01 23:34:16 +05:30
Anand Doshi
3aaab1a39e
setup wizard fixes
2015-04-01 22:01:54 +05:30
Rushabh Mehta
99d90e1f34
[setup] send welcome emails after setup
2015-04-01 20:32:57 +05:30
Anand Doshi
7b6daafbb9
[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person
2015-04-01 16:26:59 +05:30
Anand Doshi
8ea1ed143b
Show write-off section if pos or advance payment
2015-04-01 16:25:55 +05:30
Rushabh Mehta
4c8d01ba9e
[issue] close, reopen buttons
2015-04-01 15:43:14 +05:30
Rushabh Mehta
918ddf2537
[task] open, close from list:
2015-04-01 15:43:14 +05:30
Anand Doshi
ee57a8d2a4
[hotfix] unique job applicant
2015-04-01 12:29:30 +05:30
Anand Doshi
dd77287cb9
[fix] fiscal year auto-create
2015-04-01 08:26:32 +05:30
Anand Doshi
5745cf7600
fixed rename field patches
2015-03-31 17:31:53 +05:30
Anand Doshi
92af795f12
Fixed note permission query
2015-03-31 14:42:22 +05:30
Rushabh Mehta
aefc01372f
[listview] issue: open, close | so, po: stop, unstop
2015-03-31 13:39:42 +05:30
Anand Doshi
fc79492bac
Lead Status in List, minor fix in Make Email Accounts patch
2015-03-30 22:35:51 +05:30
Anand Doshi
d6a360b51b
[fix] check job application unique email id
2015-03-30 21:11:34 +05:30
Pratik Vyas
4ec1a9e8f6
Move frappe field renames to frappe
2015-03-30 19:37:02 +05:30
Sambhaji Kolate
a4fa96cc79
some fix in batch related cleanup
2015-03-30 16:04:55 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Pratik Vyas
10224c9d86
bumped to version 4.24.3
2015-03-30 13:11:48 +06:00
Anand Doshi
adcf857c37
fixed newsletter unsubscribe and default footer
2015-03-27 17:42:18 +05:30
Nabin Hait
54c865e77c
Landed cost voucher: fixes for serialized item
2015-03-27 15:39:06 +05:30
Nabin Hait
f977ad036e
reload block module
2015-03-27 10:49:41 +05:30
Nabin Hait
e5604dc944
production order operation order by idx
2015-03-26 17:40:57 +05:30
Nabin Hait
789ef7e346
stock balance report fixed
2015-03-26 17:40:57 +05:30
Neil Trini Lasrado
a6b3415cdd
Expense Claim - 'Total Amount Reimbursed' feild added
2015-03-26 14:13:44 +05:30
Nabin Hait
7057970c0c
purchase order items to be billed report
2015-03-26 11:05:13 +05:30
Rushabh Mehta
eb928b950f
[fix] journal entry 3 cols, default weekly digest
2015-03-25 17:34:20 +05:30
Nabin Hait
d25fda7537
patch fixes
2015-03-25 15:55:09 +05:30
Nabin Hait
06b0b36ae6
Patch fixes
2015-03-25 14:51:35 +05:30
Anand Doshi
d3a32bc9e5
[minor] fixed newsletter patch
2015-03-25 14:51:11 +05:30
Nabin Hait
37eaa0cca3
Merge pull request #3003 from neilLasrado/activity-type
...
time_log_for select field in TL changed to against_manufacturing (check)
2015-03-24 18:03:25 +05:30