Nabin Hait
db88bd66b0
Merge branch 'develop' of https://github.com/DigiThinkIT/erpnext into DigiThinkIT-develop
2016-10-20 16:59:40 +05:30
shreyas
edcba51c8b
[Fix] Added check to validate selling price against valuation rate
2016-10-20 15:57:45 +05:30
shreyas
1cfe2d7b45
[Minor] Validate purchase price against selling price
2016-10-20 15:57:45 +05:30
Nabin Hait
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Rohit Waghchaure
aa8abfa5b3
Test cases added in sales order to check total projected qty
2016-10-19 15:26:10 +05:30
Rohit Waghchaure
ac9172f6df
[Fix] total projected qty
2016-10-19 15:06:30 +05:30
Nabin Hait
6cb44133c3
Fixed version conflict
2016-10-18 16:18:34 +05:30
Nabin Hait
d5c4a5c802
Hotfix
2016-10-18 16:17:37 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Nabin Hait
f32547a414
Merge pull request #6637 from nabinhait/cost_center_fix
...
Set cost center while creating invoice from SO/PO
2016-10-18 15:18:16 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Nabin Hait
55a8797919
Set cost center while creating invoice from SO/PO
2016-10-18 14:54:17 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
219148d23d
Sales Personwise transaction summary - total row
2016-10-05 12:26:51 +05:30
Felipe Orellana
51082006a9
[FIX] Issue with customer doctype not allowing name series past 10
...
Query used to fetch mast number in series breaks due to sql MAX function handing string and number ordering differently. This causes the last "[name] - 9" series to be picked up as last in the series instead of "[name] - 10". Fix is to cast value to unsigned to MAX handles ordering correctly.
2016-09-23 11:58:11 -04:00
Nabin Hait
6b4eb7f77f
Fixed version conflict
2016-09-23 12:16:31 +05:30
Rohit Waghchaure
bd599b0169
[Fix] Discount copied during making of PO from SO
2016-09-22 11:47:17 +05:30
Rushabh Mehta
559aa3ab7c
[enhance] show customer, supplier billing and outstanding, fixes #6078
2016-09-19 16:04:58 +05:30
Rushabh Mehta
bd15e31ea1
[minor] [enhance] fixes #6222
2016-09-19 15:27:09 +05:30
Rushabh Mehta
e35dbca01b
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
2016-09-19 15:03:57 +05:30
Rushabh Mehta
39b5d39df6
[fix] remove campaign depends on
2016-09-16 15:55:34 +05:30
Rushabh Mehta
59dc0ece9f
[enhance] added Lead Source master, fixes #6231
2016-09-16 11:44:49 +05:30
Kanchan Chauhan
dd96cbd012
Coded column deleted, column added from UI
2016-08-26 14:32:38 +05:30
Rushabh Mehta
fcb793e4dd
[minor] language fields are now links
2016-08-23 16:51:18 +05:30
Rushabh Mehta
b969c2cb60
[minor] budget link in cost center, fixes #6093
2016-08-18 12:36:20 +05:30
Nabin Hait
4da2c81641
Merge pull request #6094 from rmehta/sales-purchase-items
...
[revert] is_sales_item, is_purchase_item back
2016-08-17 11:30:37 +05:30
Rushabh Mehta
d973c1606a
[revert] is_sales_item, is_purchase_item back
2016-08-16 11:32:08 +05:30
Neil Trini Lasrado
987009bf35
Update quotation.json
2016-08-12 16:44:00 +05:30
Neil Trini Lasrado
c917423b01
Fixed typo in quotation, added image feild in Program Enrollment
2016-08-11 18:22:45 +05:30
Rushabh Mehta
6c3ac9587e
[fix] quick entry
2016-07-25 15:03:39 +05:30
Rushabh Mehta
71b6494395
Merge pull request #5845 from KanchanChauhan/quotation-fix
...
[Minor Fix]
2016-07-23 15:16:31 +05:30
Kanchan Chauhan
39c952a3f2
[Minor Fix]
2016-07-23 14:39:01 +05:30
Nabin Hait
e0cc87d2d8
Unlink payment entries on cancellation of Invoice
2016-07-21 18:30:18 +05:30
Rushabh Mehta
5a39d41a0c
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
2016-07-20 22:53:23 +05:30
Rushabh Mehta
39077d4210
[dashboard] for quotation and sales order
2016-07-20 18:55:42 +05:30
Rushabh Mehta
fc8e589295
[fix] party status updating bug, fixes #5794 , #5796
2016-07-20 12:09:27 +05:30
Rushabh Mehta
76b134192f
[fix] grid columns now restricted to 10
2016-07-18 14:30:27 +05:30
Rushabh Mehta
176b63b354
[fix] remove first row on mapping, fixes #5707
2016-07-14 17:43:48 +05:30
Saurabh
6bc7b892c4
[fix] alter fieldtype for is_group from select to check
2016-07-14 14:06:28 +05:30
Rushabh Mehta
391c0efcee
[fix] make grids editable
2016-07-11 13:01:58 +05:30
Rushabh Mehta
7333eb280f
[minor] typo in customer.js
2016-07-07 15:34:01 +05:30
Rushabh Mehta
964ad0fcae
[cleanup] rename "links" to "dashboard"
2016-07-07 14:28:05 +05:30
Kanchan Chauhan
6d76359c31
[WIP] Task statuses updated in website
2016-07-07 12:19:01 +05:30
Kanchan Chauhan
6cb5710ffc
template selection of item disabledin Sales Order
2016-07-06 13:25:44 +05:30
Rohit Waghchaure
a71d9d33af
Rename prevdoc field in purchase order and purchase receipt doctype
2016-07-06 12:13:29 +05:30
Nabin Hait
13093b4b68
Make payment entry aginst order, payment request and patch to rename advance table fields
2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4
Advance Payment Entry adjustment against Invoice
2016-07-04 11:42:04 +05:30
Rushabh Mehta
b33df4afe8
[cleanup] link methods made common
2016-07-04 11:39:25 +05:30
Saurabh
b6d6b8420d
[fix] add filters and child doc name in previous link mapper
2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726
[fix] mark completed docuemts on document flow
2016-06-27 12:28:55 +05:30
