Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,279 Commits 3 Branches 0 Tags 1 GiB
846f2a4989
Commit Graph

8173 Commits

Author SHA1 Message Date
Martin Ender
90b0db2d18 Update open-source.md 2015-12-15 17:22:13 +05:30
Martin Ender
91a71d4f2c Update open-source.md 2015-12-15 17:22:13 +05:30
Martin Ender
36ab7f01b4 Update do-i-need-an-erp.md 2015-12-15 17:22:13 +05:30
Martin Ender
130dd2da61 Update do-i-need-an-erp.md 2015-12-15 17:22:13 +05:30
Martin Ender
6d15d36639 Update do-i-need-an-erp.md 2015-12-15 17:22:13 +05:30
Martin Ender
4395d0bc4d Update do-i-need-an-erp.md 2015-12-15 17:22:13 +05:30
Martin Ender
6e4e2152af Update print-format.md 2015-12-15 17:22:13 +05:30
Martin Ender
fc5d5d1600 Create print-format.md 2015-12-15 17:22:13 +05:30
Martin Ender
180d7e9ceb Create hiding-modules-and-features.md 2015-12-15 17:22:12 +05:30
Martin Ender
7be281e712 Create document-title.md 2015-12-15 17:22:12 +05:30
Martin Ender
9d5f4f729e Update customize-form.md 2015-12-15 17:22:12 +05:30
Martin Ender
b68087d690 Update customize-form.md 2015-12-15 17:22:12 +05:30
Martin Ender
a970e72819 Create customize-form.md 2015-12-15 17:22:12 +05:30
Martin Ender
4d0c5a51c9 Create custom-button.md 2015-12-15 17:22:12 +05:30
Martin Ender
41e1eb6af7 Create update-field-based-on-value-in-other-date-field.md 2015-12-15 17:22:12 +05:30
Martin Ender
1761004bd5 Create sales-invoice-id-based-on-sales-order-id.md 2015-12-15 17:22:12 +05:30
Martin Ender
c8fc5a2048 Create restrict-user-based-on-child-record.md 2015-12-15 17:22:12 +05:30
Martin Ender
9b639b82cf Create restrict-purpose-of-stock-entry.md 2015-12-15 17:22:12 +05:30
Martin Ender
314fa2bdad Create restrict-cancel-rights.md 2015-12-15 17:22:12 +05:30
Martin Ender
bff501c401 Create make-read-only-after-saving.md 2015-12-15 17:22:12 +05:30
Martin Ender
89d64f5b12 Update generate-code-based-on-custom-logic.md 2015-12-15 17:22:11 +05:30
Martin Ender
670269f85c Create generate-code-based-on-custom-logic.md 2015-12-15 17:22:11 +05:30
Martin Ender
38a15ab4fc Update date-validation.md 2015-12-15 17:22:11 +05:30
Martin Ender
8dfb35bb79 Create date-validation.md 2015-12-15 17:22:11 +05:30
Martin Ender
20e97c9dbc Create index.txt 2015-12-15 17:22:11 +05:30
Martin Ender
909f6da868 Create index.md 2015-12-15 17:22:11 +05:30
Martin Ender
0ffc350f57 Create custom-script-fetch-values-from-master.md 2015-12-15 17:22:11 +05:30
Martin Ender
fea9357741 Update index.md 2015-12-15 17:22:11 +05:30
Martin Ender
2fbc3b7259 Create index.txt 2015-12-15 17:22:11 +05:30
Martin Ender
f99923dc08 Create index.md 2015-12-15 17:22:11 +05:30
Martin Ender
d5781b5de8 Create custom-doctype.md 2015-12-15 17:22:11 +05:30
Martin Ender
81adb7dec9 Create custom-field.md 2015-12-15 17:22:10 +05:30
Martin Ender
46d4ba904a Create index.txt 2015-12-15 17:22:10 +05:30
Martin Ender
8c48c36be6 Create index.md 2015-12-15 17:22:10 +05:30
Martin Ender
f52b3090a9 Create tags.md 2015-12-15 17:22:10 +05:30
Martin Ender
e8703298ed Update assignment.md 2015-12-15 17:22:10 +05:30
Martin Ender
98eba6b9ba Create assignment.md 2015-12-15 17:22:10 +05:30
Martin Ender
34dc5bc812 Create calendar.md 2015-12-15 17:22:10 +05:30
Martin Ender
ba9b85c1a6 Update notes.md 2015-12-15 17:22:10 +05:30
Martin Ender
4eefd2218a Create notes.md 2015-12-15 17:22:10 +05:30
Martin Ender
d58d56f4d4 Create messages.md 2015-12-15 17:22:10 +05:30
Martin Ender
1d7d055d16 Create collaborating-around-forms.md 2015-12-15 17:22:09 +05:30
Martin Ender
2e7dca8693 Create to-do.md 2015-12-15 17:22:09 +05:30
Martin Ender
746e21f283 Create index.txt 2015-12-15 17:22:09 +05:30
Martin Ender
60eed43269 Create index.md 2015-12-15 17:22:09 +05:30
Martin Ender
b2b7d91010 Create social-login-keys.md 2015-12-15 17:22:09 +05:30
Martin Ender
1641f0815e Create website-settings.md 2015-12-15 17:22:09 +05:30
Martin Ender
e3f4b6ce6f Create index.txt 2015-12-15 17:22:09 +05:30
Martin Ender
7a6ec814b9 Create index.md 2015-12-15 17:22:09 +05:30
Martin Ender
4325a8c82f Create blogger.md 2015-12-15 17:22:09 +05:30
Martin Ender
6bff33b949 Create web-form.md 2015-12-15 17:22:09 +05:30
Martin Ender
99c244c834 Create blog-post.md 2015-12-15 17:22:08 +05:30
Martin Ender
838db977fe Create web-page.md 2015-12-15 17:22:08 +05:30
Martin Ender
837b656c45 Create index.txt 2015-12-15 17:22:08 +05:30
Martin Ender
7641a957eb Create index.md 2015-12-15 17:22:08 +05:30
Martin Ender
f8a383b339 Create issues.md 2015-12-15 17:22:08 +05:30
Martin Ender
d144bfe2ca Create sign-up.md 2015-12-15 17:22:08 +05:30
Martin Ender
b5edc6676e Update portal-login.md 2015-12-15 17:22:08 +05:30
Martin Ender
f72a1eb782 Create portal-login.md 2015-12-15 17:22:08 +05:30
Martin Ender
a574979ebc Create customer-orders-invoices-and-shipping.md 2015-12-15 17:22:08 +05:30
Martin Ender
49b3c0c064 Create index.txt 2015-12-15 17:22:08 +05:30
Martin Ender
d32a43c39f Create index.md 2015-12-15 17:22:08 +05:30
Martin Ender
3162f31fd8 Create holyday-list.md 2015-12-15 17:22:08 +05:30
Martin Ender
952c336f70 Create leave-type.md 2015-12-15 17:22:07 +05:30
Martin Ender
2f6a29b060 Update leave-allocation.md 2015-12-15 17:22:07 +05:30
Martin Ender
55e467dc20 Create leave-allocation.md 2015-12-15 17:22:07 +05:30
Martin Ender
df5aa98d00 Create deduction-type.md 2015-12-15 17:22:07 +05:30
Martin Ender
ffa18f4dc8 Create earning-type.md 2015-12-15 17:22:07 +05:30
Martin Ender
cea952c1c4 Create designation.md 2015-12-15 17:22:07 +05:30
Martin Ender
92a3aa9fad Update branch.md 2015-12-15 17:22:07 +05:30
Martin Ender
3b7f626c0b Update branch.md 2015-12-15 17:22:07 +05:30
Martin Ender
8d71597c03 Update branch.md 2015-12-15 17:22:07 +05:30
Martin Ender
786779fd5c Create department.md 2015-12-15 17:22:07 +05:30
Martin Ender
0c30c9cccb Update branch.md 2015-12-15 17:22:07 +05:30
Martin Ender
6479f0e82a Update and rename department.md to branch.md 2015-12-15 17:22:07 +05:30
Martin Ender
f8da1ff59f Create department.md 2015-12-15 17:22:06 +05:30
Martin Ender
043ab0c47e Create employment-type.md 2015-12-15 17:22:06 +05:30
Martin Ender
6e982264db Update hr-settings.md 2015-12-15 17:22:06 +05:30
Martin Ender
ed9f8de78c Create hr-settings.md 2015-12-15 17:22:06 +05:30
Martin Ender
80f1fc4fcb Create index.txt 2015-12-15 17:22:06 +05:30
Martin Ender
c26b090c72 Create index.md 2015-12-15 17:22:06 +05:30
Martin Ender
a637010af1 Create human-resources-report.md 2015-12-15 17:22:06 +05:30
Martin Ender
108c1f8783 Create leave-allocation-tool.md 2015-12-15 17:22:06 +05:30
Martin Ender
cfb0b3d371 Create upload-attendance.md 2015-12-15 17:22:06 +05:30
Martin Ender
e1a3b369e8 Create index.txt 2015-12-15 17:22:06 +05:30
Martin Ender
f0f54d53f4 Create index.md 2015-12-15 17:22:06 +05:30
Martin Ender
fdf61e40f3 Create offer-letter.md 2015-12-15 17:22:06 +05:30
Martin Ender
9a12221d72 Create job-opening.md 2015-12-15 17:22:05 +05:30
Martin Ender
6bea8c7bc2 Create job-applicant.md 2015-12-15 17:22:05 +05:30
Martin Ender
7bfba0fb0e Create appraisal.md 2015-12-15 17:22:05 +05:30
Martin Ender
15597d7f60 Update salary-and-payroll.md 2015-12-15 17:22:05 +05:30
Martin Ender
19fb4f231d Create salary-and-payroll.md 2015-12-15 17:22:05 +05:30
Martin Ender
fc70f4c9e8 Update attendance.md 2015-12-15 17:22:05 +05:30
Martin Ender
b0fc040dcc Create attendance.md 2015-12-15 17:22:05 +05:30
Martin Ender
26018adff4 Create expense-claim.md 2015-12-15 17:22:05 +05:30
Martin Ender
73933c1195 Create leave-application.md 2015-12-15 17:22:05 +05:30
Martin Ender
1d3d0ed595 Create employee.md 2015-12-15 17:22:05 +05:30
Martin Ender
9d80e47d27 Create index.txt 2015-12-15 17:22:05 +05:30
Martin Ender
f2fc91b73e Create index.md 2015-12-15 17:22:04 +05:30
Martin Ender
b77eb6d383 Create maintenance-schedule.md 2015-12-15 17:22:04 +05:30
Martin Ender
6ced0da90b Create maintenance-visit.md 2015-12-15 17:22:04 +05:30
Martin Ender
6aaec8e874 Create warranty-claim.md 2015-12-15 17:22:04 +05:30
Martin Ender
e4ba4d0efd Update issue.md 2015-12-15 17:22:04 +05:30
Martin Ender
acef1eaa9d Create issue.md 2015-12-15 17:22:04 +05:30
Martin Ender
75960296c9 Create index.txt 2015-12-15 17:22:04 +05:30
Martin Ender
924b9c1763 Update index.md 2015-12-15 17:22:04 +05:30
Martin Ender
92f2771ae2 Create index.md 2015-12-15 17:22:04 +05:30
Martin Ender
88a2580ec5 Create activity-cost.md 2015-12-15 17:22:04 +05:30
Martin Ender
95a2e2f5e4 Create activity-type.md 2015-12-15 17:22:04 +05:30
Martin Ender
90f44ba6ac Create time-log-batch.md 2015-12-15 17:22:04 +05:30
Martin Ender
b32d97f071 Create time-log.md 2015-12-15 17:22:03 +05:30
Martin Ender
8cb9cfdb81 Create project.md 2015-12-15 17:22:03 +05:30
Martin Ender
44420e4df7 Create tasks.md 2015-12-15 17:22:03 +05:30
Martin Ender
55bd4f7d06 Create index.txt 2015-12-15 17:22:03 +05:30
Martin Ender
1d1e03b792 Create index.md 2015-12-15 17:22:03 +05:30
Martin Ender
bb4fcd9438 Create manufacturing-settings.md 2015-12-15 17:22:03 +05:30
Martin Ender
b61345c040 Create index.md 2015-12-15 17:22:03 +05:30
Martin Ender
1827c3bc5f Create index.txt 2015-12-15 17:22:03 +05:30
Martin Ender
e65df29aed Update bom-replace-tool.md 2015-12-15 17:22:03 +05:30
Martin Ender
c9588f5aa3 Create bom-replace-tool.md 2015-12-15 17:22:03 +05:30
Martin Ender
6a2a290194 Create production-planning-tool.md 2015-12-15 17:22:03 +05:30
Martin Ender
8c95b5492c Create index.txt 2015-12-15 17:22:02 +05:30
Martin Ender
3cf31eaefe Create index.md 2015-12-15 17:22:02 +05:30
Martin Ender
0349c8e96d Create subcontracting.md 2015-12-15 17:22:02 +05:30
Martin Ender
666b63aa5e Create operation.md 2015-12-15 17:22:02 +05:30
Martin Ender
16fca942bb Create workstation.md 2015-12-15 17:22:02 +05:30
Martin Ender
bf5f7425bb Create production-order.md 2015-12-15 17:22:02 +05:30
Martin Ender
a165451b84 Create bill-of-materials.md 2015-12-15 17:22:02 +05:30
Martin Ender
5f7ac05af3 Create introduction.md 2015-12-15 17:22:02 +05:30
Martin Ender
afc9afa01f Create index.txt 2015-12-15 17:22:02 +05:30
Martin Ender
fe032bfb6f Create index.md 2015-12-15 17:22:02 +05:30
Martin Ender
71f5792f02 Create supplier-type.md 2015-12-15 17:22:02 +05:30
Martin Ender
0c70bd4b10 Create buying-settings.md 2015-12-15 17:22:02 +05:30
Martin Ender
f8ee7e12ef Create index.txt 2015-12-15 17:22:01 +05:30
Martin Ender
f8a93b6cb1 Create index.md 2015-12-15 17:22:01 +05:30
Martin Ender
612ec6c289 Create purchase-order.md 2015-12-15 17:22:01 +05:30
Martin Ender
2fe811695c Create supplier-quotation.md 2015-12-15 17:22:01 +05:30
Martin Ender
3cedb81670 Create supplier.md 2015-12-15 17:22:01 +05:30
Martin Ender
393afdaa1f Create index.md 2015-12-15 17:22:01 +05:30
Martin Ender
80b1ff7744 Create index.txt 2015-12-15 17:22:01 +05:30
Martin Ender
0689d27072 Create sales-return.md 2015-12-15 17:22:01 +05:30
Martin Ender
e44372ca6b Create purchase-return.md 2015-12-15 17:22:01 +05:30
Martin Ender
a94073d37d Create item-attribute.md 2015-12-15 17:22:01 +05:30
Martin Ender
5d9a9473d3 Create item-group.md 2015-12-15 17:22:01 +05:30
Martin Ender
6854d66cdc Create stock-settings.md 2015-12-15 17:22:00 +05:30
Martin Ender
29675f8bbd Create index.txt 2015-12-15 17:22:00 +05:30
Martin Ender
2ffb4a7a8d Create index.md 2015-12-15 17:22:00 +05:30
Martin Ender
692e465829 Create uom-replacement-tool.md 2015-12-15 17:22:00 +05:30
Martin Ender
eaed755e0f Create landed-cost-voucher.md 2015-12-15 17:22:00 +05:30
Martin Ender
f32d3716b8 Create quality-inspection.md 2015-12-15 17:22:00 +05:30
Martin Ender
e493a9252b Update packing-slip.md 2015-12-15 17:22:00 +05:30
Martin Ender
e005662cf0 Create packing-slip.md 2015-12-15 17:22:00 +05:30
Martin Ender
e83697c21c Create index.txt 2015-12-15 17:22:00 +05:30
Martin Ender
c3c654c672 Create index.md 2015-12-15 17:22:00 +05:30
Martin Ender
c6a445fa8e Update migrate-to-perpetual-inventory.md 2015-12-15 17:22:00 +05:30
Martin Ender
6ebf5b0bbb Create migrate-to-perpetual-inventory.md 2015-12-15 17:22:00 +05:30
Martin Ender
668ea8a161 Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
49c58975d9 Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
3d9ef3202e Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
4dd13fd81e Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
edc5a79fbf Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
a3bb3cded0 Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
c8e88f5bba Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
c4ffa9ceb0 Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
b8834c3c1c Update perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
c384bc8045 Create perpetual-inventory.md 2015-12-15 17:21:59 +05:30
Martin Ender
9d0e4c841b Create index.txt 2015-12-15 17:21:59 +05:30
Martin Ender
3097e73e5a Create index.md 2015-12-15 17:21:59 +05:30
Martin Ender
eec101dffb Create projected-quantity.md 2015-12-15 17:21:58 +05:30
Martin Ender
40e5b0589a Create batch.md 2015-12-15 17:21:58 +05:30
Martin Ender
ee343c8c77 Create serial-no.md 2015-12-15 17:21:58 +05:30
Martin Ender
079ac113fb Create warehouse.md 2015-12-15 17:21:58 +05:30
Martin Ender
285ec76130 Delete article-variants.mg 2015-12-15 17:21:58 +05:30
Martin Ender
e1eb761807 Create article-variants.md 2015-12-15 17:21:58 +05:30
Martin Ender
ae8974b627 Create article-variants.mg 2015-12-15 17:21:58 +05:30
Martin Ender
ea18cc464a Create article-coding.md 2015-12-15 17:21:58 +05:30
Martin Ender
064da78734 Create index.txt 2015-12-15 17:21:58 +05:30
Martin Ender
c87dc4771c Create index.md 2015-12-15 17:21:58 +05:30
Martin Ender
c5aede5b4c Create installation-note.md 2015-12-15 17:21:58 +05:30
Martin Ender
d8785dde0c Create purchase-receipt.md 2015-12-15 17:21:58 +05:30
Martin Ender
669e4df639 Create delivery-note.md 2015-12-15 17:21:57 +05:30
Martin Ender
e7894fab39 Create stock-entry.md 2015-12-15 17:21:57 +05:30
Martin Ender
f8be4394dc Create material-request.md 2015-12-15 17:21:57 +05:30
Martin Ender
384f620c9d Create index.txt 2015-12-15 17:21:57 +05:30
Martin Ender
ba0ae97fdf Create index.md 2015-12-15 17:21:57 +05:30
Martin Ender
a95a189592 Update product-bundle.md 2015-12-15 17:21:57 +05:30
Martin Ender
5ede3a8a6f Create product-bundle.md 2015-12-15 17:21:57 +05:30
Martin Ender
49e8628627 Create shipping-rule.md 2015-12-15 17:21:57 +05:30
Martin Ender
05521ee102 Create sales-partner.md 2015-12-15 17:21:57 +05:30
Martin Ender
11e9c18b51 Update selling-settings.md 2015-12-15 17:21:57 +05:30
Martin Ender
5fcb3d7775 Update selling-settings.md 2015-12-15 17:21:57 +05:30
Martin Ender
84226006dd Create selling-settings.md 2015-12-15 17:21:56 +05:30
Martin Ender
4fc998d0f9 Create index.txt 2015-12-15 17:21:56 +05:30
Martin Ender
938b9b2097 Create index.md 2015-12-15 17:21:56 +05:30
Martin Ender
61c2d88781 Create sales-order.md 2015-12-15 17:21:56 +05:30
Martin Ender
fdba12d355 Update quotation.md 2015-12-15 17:21:56 +05:30
Martin Ender
8e1014565e Create quotation.md 2015-12-15 17:21:56 +05:30
Martin Ender
040c565a44 Create index.txt 2015-12-15 17:21:56 +05:30
Martin Ender
54f7616cf8 Create index.md 2015-12-15 17:21:56 +05:30
Martin Ender
b27f2dc012 Create tax-rule.md 2015-12-15 17:21:56 +05:30
Martin Ender
7bf3d908ba Create account-settings.md 2015-12-15 17:21:56 +05:30
Martin Ender
17caf1f6e5 Create cost-center.md 2015-12-15 17:21:56 +05:30
Martin Ender
b1c5f385bf Create fiscal-year.md 2015-12-15 17:21:56 +05:30
Martin Ender
457cfb7b60 Create index.txt 2015-12-15 17:21:55 +05:30
Martin Ender
46e0166d1f Create index.md 2015-12-15 17:21:55 +05:30
Martin Ender
0b55567b44 Create payment-tool.md 2015-12-15 17:21:55 +05:30
Martin Ender
f3ca6d0ac3 Create period-closing-voucher.md 2015-12-15 17:21:55 +05:30
Martin Ender
06ff0e42d9 Create payment-reconciliation.md 2015-12-15 17:21:55 +05:30
Martin Ender
1727bdb2b8 Create bank-reconciliation.md 2015-12-15 17:21:55 +05:30
Martin Ender
80300b321d Create index.md 2015-12-15 17:21:55 +05:30
Martin Ender
5c8c606b50 Create index.txt 2015-12-15 17:21:55 +05:30
Martin Ender
7b8e9a39e7 Update multi-currency-accounting.md 2015-12-15 17:21:55 +05:30
Martin Ender
054d63c94e Create multi-currency-accounting.md 2015-12-15 17:21:55 +05:30
Martin Ender
4deb7aaea2 Create point-of-sales-invoice.md 2015-12-15 17:21:55 +05:30
Martin Ender
f146046845 Create item-wise-tax.md 2015-12-15 17:21:55 +05:30
Martin Ender
f8942dd060 Update opening-accounts.md 2015-12-15 17:21:54 +05:30
Martin Ender
ee1f66bc86 Create opening-accounts.md 2015-12-15 17:21:54 +05:30
Martin Ender
ae77cb4959 Create budgeting.md 2015-12-15 17:21:54 +05:30
Martin Ender
6ba0f7bf75 Create accounting-entries.md 2015-12-15 17:21:54 +05:30
Martin Ender
3e2ebe5972 Update accounting-reports.md 2015-12-15 17:21:54 +05:30
Martin Ender
5f2f82de56 Create accounting-reports.md 2015-12-15 17:21:54 +05:30
Martin Ender
9d0d426ed6 Update opening-entry.md 2015-12-15 17:21:54 +05:30
Martin Ender
d7ea4ec2b6 Create opening-entry.md 2015-12-15 17:21:54 +05:30
Martin Ender
4d35ef149f Create credit-limit.md 2015-12-15 17:21:54 +05:30
Martin Ender
34fe511260 Create advance-payment-entry.md 2015-12-15 17:21:54 +05:30
Martin Ender
03a3d5089c Create making-payments.md 2015-12-15 17:21:54 +05:30
Martin Ender
8af11201d9 Update chart-of-accounts.md 2015-12-15 17:21:54 +05:30
Martin Ender
cd35d45628 Create chart-of-accounts.md 2015-12-15 17:21:53 +05:30
Martin Ender
dd09f67e75 Create purchase-invoice.md 2015-12-15 17:21:53 +05:30
Martin Ender
a51c4403a5 Update sales-invoice.md 2015-12-15 17:21:53 +05:30
Martin Ender
5656c6e969 Create sales-invoice.md 2015-12-15 17:21:53 +05:30
Martin Ender
635528e186 Create journal-entry.md 2015-12-15 17:21:53 +05:30
Martin Ender
49e39f0cde Create index.md 2015-12-15 17:21:53 +05:30
Martin Ender
e9784d1280 Create index.txt 2015-12-15 17:21:53 +05:30
Martin Ender
82e3e08650 Create sales-person.md 2015-12-15 17:21:53 +05:30
Martin Ender
721de2629e Create customer-group.md 2015-12-15 17:21:53 +05:30
Martin Ender
19d627c51f Create campaign.md 2015-12-15 17:21:53 +05:30
Martin Ender
a1d129f836 Create index.txt 2015-12-15 17:21:53 +05:30
Martin Ender
79f52a54ef Create index.md 2015-12-15 17:21:52 +05:30
Martin Ender
92091ce22d Create newsletter.md 2015-12-15 17:21:52 +05:30
Martin Ender
019196894c Create contact.md 2015-12-15 17:21:52 +05:30
Martin Ender
fbce19b2c6 Create opportunity.md 2015-12-15 17:21:52 +05:30
Martin Ender
84a9b6c816 Create customer.md 2015-12-15 17:21:52 +05:30
Martin Ender
aeb0934da0 Create lead.md 2015-12-15 17:21:52 +05:30
Martin Ender
347a580883 Create index.md 2015-12-15 17:21:52 +05:30
Martin Ender
2891c5ebca Create index.txt 2015-12-15 17:21:52 +05:30
Martin Ender
fc1bb3ee1d Create company-setup.md 2015-12-15 17:21:52 +05:30
Martin Ender
bd194a9fb7 Create bar-code.md 2015-12-15 17:21:52 +05:30
Martin Ender
4bd999cbc5 Update workflows.md 2015-12-15 17:21:52 +05:30
Martin Ender
bb154ad6c9 Create workflows.md 2015-12-15 17:21:52 +05:30
Martin Ender
f7d133f4a0 Update third-party-backups.md 2015-12-15 17:21:51 +05:30
Martin Ender
b79151ccac Create third-party-backups.md 2015-12-15 17:21:51 +05:30
Martin Ender
5b509ca194 Update territory.md 2015-12-15 17:21:51 +05:30
Martin Ender
38aa8982f8 Create territory.md 2015-12-15 17:21:51 +05:30
Martin Ender
c46504dfdf Update stock-reconciliation-for-non-serialized-item.md 2015-12-15 17:21:51 +05:30
Martin Ender
279fc35cb2 Create stock-reconciliation-for-non-serialized-item.md 2015-12-15 17:21:51 +05:30
Martin Ender
4887292513 Update sms-setting.md 2015-12-15 17:21:51 +05:30
Martin Ender
a056a7e390 Create sms-setting.md 2015-12-15 17:21:51 +05:30
Martin Ender
d82fec317e Create authorization-rule.md 2015-12-15 17:21:51 +05:30
Martin Ender
2545651a77 Create price-lists.md 2015-12-15 17:21:51 +05:30
Martin Ender
43029c2754 Create pos-setting.md 2015-12-15 17:21:51 +05:30
Martin Ender
3adcca8238 Update setting-up-taxes.md 2015-12-15 17:21:51 +05:30
Martin Ender
a76f957345 Update setting-up-taxes.md 2015-12-15 17:21:50 +05:30
Martin Ender
6935ae7f60 Create setting-up-taxes.md 2015-12-15 17:21:50 +05:30
Martin Ender
72e3741b44 Create terms-and-conditions.md 2015-12-15 17:21:50 +05:30
Martin Ender
609568d6d5 Create address-template.md 2015-12-15 17:21:50 +05:30
Martin Ender
576c76f71c Create letter-head.md 2015-12-15 17:21:50 +05:30
Martin Ender
a952fef53d Create print-headings.md 2015-12-15 17:21:50 +05:30
Martin Ender
5dc46b6096 Delete print-headings.md3 2015-12-15 17:21:50 +05:30
Martin Ender
463bd7b742 Create print-headings.md3 2015-12-15 17:21:50 +05:30
Martin Ender
e5cb6ab319 Create print-format-builder.md 2015-12-15 17:21:50 +05:30
Martin Ender
eeb280e06d Create print-settings.md 2015-12-15 17:21:50 +05:30
Martin Ender
2799039eec Create index.txt 2015-12-15 17:21:50 +05:30
Martin Ender
84f47e54af Create index.md 2015-12-15 17:21:50 +05:30
Martin Ender
3cd67c9e9b Create sending-email.md 2015-12-15 17:21:49 +05:30
Martin Ender
6b3d94a5df Update email-digest.md 2015-12-15 17:21:49 +05:30
Martin Ender
218cc5d1f2 Create email-digest.md 2015-12-15 17:21:49 +05:30
Martin Ender
f53407b76e Update concepts-and-terms.md 2015-12-15 17:21:49 +05:30
Martin Ender
92988591fc Update user-permissions.md 2015-12-15 17:21:49 +05:30
Martin Ender
9b69827d2c Update role-based-permissions.md 2015-12-15 17:21:49 +05:30
Martin Ender
4136b3170a Update adding-users.md 2015-12-15 17:21:49 +05:30
Martin Ender
f3459158c6 Delete globals-defaults.md 2015-12-15 17:21:49 +05:30
Martin Ender
a82056f424 Create global-defaults.md 2015-12-15 17:21:49 +05:30
Martin Ender
a440125ef2 Update system-settings.md 2015-12-15 17:21:49 +05:30
Martin Ender
3e8aec4d64 Update naming-series.md 2015-12-15 17:21:49 +05:30
Martin Ender
97a27f3d46 Update naming-series.md 2015-12-15 17:21:48 +05:30
Martin Ender
0eb0f59194 Update module-settings.md 2015-12-15 17:21:48 +05:30
Martin Ender
fce8780c08 Update globals-defaults.md 2015-12-15 17:21:48 +05:30
Martin Ender
48d45869ab Update email-alerts.md 2015-12-15 17:21:48 +05:30
Martin Ender
349360b3a1 Update email-alerts.md 2015-12-15 17:21:48 +05:30
Martin Ender
5e646cd8ad Update email-alerts.md 2015-12-15 17:21:48 +05:30
Martin Ender
8bcd104cec Create email-alerts.md 2015-12-15 17:21:48 +05:30
Martin Ender
5e91280912 Create email-account.md 2015-12-15 17:21:48 +05:30
Martin Ender
5fec1751a7 Create index.txt 2015-12-15 17:21:48 +05:30
Martin Ender
91802f914c Create index.md 2015-12-15 17:21:48 +05:30
Martin Ender
f779df2737 Create bulk-rename.md 2015-12-15 17:21:48 +05:30
Martin Ender
fad1363756 Update data-import-tool.md 2015-12-15 17:21:47 +05:30
Martin Ender
b041b905d0 Rename data-import-tool.md2.4.1 Werkzeug zum Datenimport Das Werkzeug zum Datenimport ist ein großartiger Weg um große Mengen an Daten, speziell Stammdaten, in das System hochzuladen oder zu bearbeiten. Um das Werkzeug zum Datenimport zu öffnen, gehen Sie entweder zu den Einstellungen oder zur Transaktion, für die Sie importieren wollen. Wenn der Datenimport erlaubt ist, sehen Sie eine Importschaltfläche: Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und einen zweiten um Daten hoch zu laden. (Anmerkung: Für den Import sind nur die DocTypes zugelassen, deren Dokumenttyp "Stammdaten" ist, oder bei denen die Einstellung "Import erlauben" aktiviert ist.) 1. Herunterladen der Vorlage Daten werden in ERPNext in Tabellen gespeichert, sehr ähnlich einer Tabellenkalkulation mit Spalten und Zeilen voller Daten. Jede Instanz in ERPNext kann mehrere verschiedene mit Ihr verbundene Untertabellen haben. Die Untertabellen sind mit Ihren übergeordneten Tabellen verknüpft und werden dort eingesetzt, wo es für eine Eigenschaft mehrere verschiedene Werte gibt. So kann z. B. ein Artikel mehrere verschiedene Preise haben, eine Rechnung hat mehrere verschiedene Artikel usw. - Klicken Sie auf die Tabelle, die Sie herunter laden wollen, oder auf "Alle Tabellen". - Für Massenbearbeitung klicken Sie auf "Mit Daten herunterladen". 2. Füllen Sie die Vorlage aus Öffnen Sie die Vorlage nach dem Herunterladen in einer Tabellenkalkulationsanwendung und fügen Sie die Daten unterhalb der Spaltenköpfe ein. Exportieren Sie dann Ihre Vorlage oder speichern Sie sie im CSV-Format (Comma Separated Values). 3. Hochladen der CSV-Datei Fügen Sie abschliessend die CSV-Datei im Abschnitt Import hinzu. Klicken Sie auf die Schaltfläche "Hochladen und Importieren". Anmerkungen: 1. Stellen Sie sicher, dass Sie als Verschlüsselung UTF-8 verwenden, wenn Ihre Anwendung das zulässt. 2. Lassen Sie die Spalte ID für einen neuen Datensatz leer. 4. Hochladen aller Tabellen (übergeordnete und Untertabellen) Wenn Sie alle Tabellen auswählen, dann erhalten Sie Spalten für alle Tabellen in einer Zeile gertrennt durch ~ Spalten. Wenn Sie mehrere verschiedene Unterzeilen haben, dann müssen Sie einen neuen Hauptartikel in einer neuen Zeile eintragen. Sehen Sie hierzu das Beispiel unten: Main Table ~ Child Table Column 1 Column 2 Column 3 ~ Column 1 Column 2 Column 3 v11 v12 v13 c11 c12 c13 c14 c15 c17 v21 v22 v23 c21 c22 c23 Um zu sehen, wie das gemacht wird, geben Sie manuell über Formulare einige Datensätze ein und exportieren Sie "Alle Tabellen" über "Mit Daten herunterladen". 5. Überschreiben ERPNext ermöglicht es Ihnen auch alle oder bestimmte Spalten zu überschreiben. Wenn Sie bestimmte Spalten aktualisieren möchten, können Sie die Vorlage mit Daten herunter laden. Vergessen Sie nicht die Box "Überschreiben" zu markieren, bevor sie hochladen. Anmerkung: Wenn Sie "Überschreiben" auswählen, werden alle Unterdatensätze eines übergeordneten Elements gelöscht. 6. Einschränkungen beim Hochladen ERPNext begrenzt die Menge an Daten, die Sie in einer Datei hochladen können. Die Menge kann sich je nach Datentyp unterscheiden. Normalerweise kann man problemlos ungefähr 1.000 Zeilen einer Tabelle in einem Vorgang hochladen. Wenn das System den Vorgang nicht akzeptiert, sehen Sie eine Fehlermeldung. Warum das alles? Wenn Sie zuviele Daten hochladen, kann das System abstürzen, im Besonderen dann, wenn andere Benutzer parallel arbeiten. Daher begrenzt ERPNext die Anzahl von Schreibvorgängen, die Sie mit einer Eingabe verarbeiten können. Wie fügen Sie Dateien an? Wenn Sie ein Formular öffnen, dann sehen Sie in der Seitenleiste rechts einen Abschnitt zum Anfügen von Dateien. Klicken Sie auf "Hinzufügen" und wählen Sie die Datei aus, die Sie anfügen möchten. Klicken Sie auf "Hochladen" und die Sache ist erledigt. Was ist eine CSV-Datei? Eine CSV (Durch Kommas getrennte Werte)-Datei ist ein Datensatz, den Sie in ERPNext hochladen können um verschiedene Daten zu aktualisieren. Jedes gebräuchliche Tabellenkalkulationsprogramm wie MS-Excel oder OpenOffice Spreadsheet kann im CSV-Format abspeichern. Wenn Sie Microsoft Excel benutzen und nicht-englische Zeichen verwenden, dann sollten Sie Ihre Datei UTF-8-kodiert abspeichern. Bei älteren Versionen von Excel gibt es keinen eindeutigen Weg als UTF-8 zu speichern. Deshalb können Sie die Datei auch ganz einfach als CSV abspeichern, dann mit Notepad öffnen und als UTF-8 abspeichern. (Microsoft Excel kann das leider nicht.) to data-import-tool.md 2015-12-15 17:21:47 +05:30
Martin Ender
ed4e85bf97 Create index.md 2015-12-15 17:21:47 +05:30
Martin Ender
1a8e484542 Create index.txt 2015-12-15 17:21:47 +05:30
Martin Ender
8794bb9c5f Delete system-settings.md 2015-12-15 17:21:47 +05:30
Martin Ender
1cd13ce2d5 Delete naming-series.md 2015-12-15 17:21:47 +05:30
Martin Ender
c1bdc108c8 Delete index.txt 2015-12-15 17:21:47 +05:30
Martin Ender
6549710eaa Delete module-settings.md 2015-12-15 17:21:47 +05:30
Martin Ender
4634194009 Delete index.md 2015-12-15 17:21:47 +05:30
Martin Ender
14006ad8c8 Delete global-defaults.md 2015-12-15 17:21:47 +05:30
Martin Ender
89a7730406 Create system-settings.md 2015-12-15 17:21:47 +05:30
Martin Ender
c2e913e0ca Create naming-series.md 2015-12-15 17:21:47 +05:30
Martin Ender
afbf3296d4 Create module-settings.md 2015-12-15 17:21:46 +05:30
Martin Ender
75963505dc Create index.md 2015-12-15 17:21:46 +05:30
Martin Ender
9ec61cf150 Create globals-defaults.md 2015-12-15 17:21:46 +05:30
Martin Ender
699feb0384 Create index.txt 2015-12-15 17:21:46 +05:30
Martin Ender
da00bacb55 Create global-defaults.md 2015-12-15 17:21:46 +05:30
Martin Ender
8ca8b14720 Create naming-series.md 2015-12-15 17:21:46 +05:30
Martin Ender
64b47ade3b Create module-settings.md 2015-12-15 17:21:46 +05:30
Martin Ender
423791a1cd Create system-settings.md 2015-12-15 17:21:46 +05:30
Martin Ender
9b09fea692 Create index.txt 2015-12-15 17:21:46 +05:30
Martin Ender
098cb65a54 Create index.md 2015-12-15 17:21:46 +05:30
Martin Ender
2cf2f48c02 Create sharing.md 2015-12-15 17:21:46 +05:30
Martin Ender
85febb969e Update user-permissions.md 2015-12-15 17:21:46 +05:30
Martin Ender
952e19a9bb Create user-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
451ad3fe93 Update role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
cec0728bba Update role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
44838ea239 Update role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
3c29d6faa2 Update role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
5c4fdfce44 Create role-based-permissions.md 2015-12-15 17:21:45 +05:30
Martin Ender
19bed183b0 Update adding-users.md 2015-12-15 17:21:45 +05:30
Martin Ender
53523539f4 Create adding-users.md 2015-12-15 17:21:45 +05:30
Martin Ender
a5488e43ad Create index.md 2015-12-15 17:21:45 +05:30
Martin Ender
f8a2587cf4 Create index.txt 2015-12-15 17:21:45 +05:30
Martin Ender
337972eada Create step-10-item.md 2015-12-15 17:21:45 +05:30
Martin Ender
e5944e8866 Create step-9-suppliers.md 2015-12-15 17:21:45 +05:30
Martin Ender
ee17a60872 Create step-8-customer-names.md 2015-12-15 17:21:44 +05:30
Martin Ender
35ad87bb14 Create step-7-tax-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
421bef2db4 Update step-6-add-users.md 2015-12-15 17:21:44 +05:30
Martin Ender
0048d29799 Create step-6-add-users.md 2015-12-15 17:21:44 +05:30
Martin Ender
5029670657 Update step-1-language.md 2015-12-15 17:21:44 +05:30
Martin Ender
d40ec15f1c Update step-2-currency-and-timezone.md 2015-12-15 17:21:44 +05:30
Martin Ender
9873c4029b Update step-3-user-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
78b4ae02cb Update step-4-company-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
9fa9b34930 Update step-5-letterhead-and-logo.md 2015-12-15 17:21:44 +05:30
Martin Ender
61b6918e73 Create step-5-letterhead-and-logo.md 2015-12-15 17:21:44 +05:30
Martin Ender
755d14b004 Create step-4-company-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
2d3670b6a4 Create step-3-user-details.md 2015-12-15 17:21:44 +05:30
Martin Ender
8ff1c7b3e0 Create step-2-currency-and-timezone.md 2015-12-15 17:21:43 +05:30
Martin Ender
8df03c6e30 Create step-1-language.md 2015-12-15 17:21:43 +05:30
Martin Ender
cab2fc6e73 Create index.txt 2015-12-15 17:21:43 +05:30
Martin Ender
a5b9008088 Create index.md 2015-12-15 17:21:43 +05:30
Martin Ender
0a5ccb008a Create index.md 2015-12-15 17:21:43 +05:30
Martin Ender
83b8d33e78 Create index.txt 2015-12-15 17:21:43 +05:30
Martin Ender
9c2a20a67b Update the-champion.md 2015-12-15 17:21:43 +05:30
Martin Ender
a7465f8fd6 Update open-source.md 2015-12-15 17:21:43 +05:30
Martin Ender
49b476b9e5 Update key-workflows.md 2015-12-15 17:21:43 +05:30
Martin Ender
7f7f77f4d7 Create index.txt 2015-12-15 17:21:43 +05:30
Martin Ender
356c552b41 Update index.md 2015-12-15 17:21:43 +05:30
Martin Ender
1ccbd82b35 Update implementation-strategy.md 2015-12-15 17:21:43 +05:30
Martin Ender
e606678b8f Update getting-started-with-erpnext.md 2015-12-15 17:21:42 +05:30
Martin Ender
45db6156c7 Update getting-started-with-erpnext.md 2015-12-15 17:21:42 +05:30
Martin Ender
9d3da40351 Update getting-started-with-erpnext.md 2015-12-15 17:21:42 +05:30
Martin Ender
3f51a8aed4 Update do-i-need-an-erp.md 2015-12-15 17:21:42 +05:30
Martin Ender
e7d09edc0d Update do-i-need-an-erp.md 2015-12-15 17:21:42 +05:30
Martin Ender
94c7fa0141 Update concepts-and-terms.md 2015-12-15 17:21:42 +05:30
Martin Ender
abe9abc90b Update concepts-and-terms.md 2015-12-15 17:21:42 +05:30
Martin Ender
dbb25b67a5 Update concepts-and-terms.md 2015-12-15 17:21:42 +05:30
Martin Ender
d4e8e05749 Create concepts-and-terms.md 2015-12-15 17:21:42 +05:30
Martin Ender
02d28f1422 Create key-workflows.md 2015-12-15 17:21:42 +05:30
Martin Ender
a97265c8af Create implementation-strategy.md 2015-12-15 17:21:42 +05:30
Martin Ender
0480ad45f6 Create the-champion.md 2015-12-15 17:21:42 +05:30
Martin Ender
c8ea02d745 Update getting-started-with-erpnext.md 2015-12-15 17:21:41 +05:30
Martin Ender
028f246cae Update getting-started-with-erpnext.md 2015-12-15 17:21:41 +05:30
Martin Ender
f683bbee59 Create getting-started-with-erpnext.md 2015-12-15 17:21:41 +05:30
Martin Ender
e01309f07e Update open-source.md 2015-12-15 17:21:41 +05:30
Martin Ender
d7786190e6 Create open-source.md 2015-12-15 17:21:41 +05:30
Martin Ender
5bce109e8e Create do-i-need-an-erp.md 2015-12-15 17:21:41 +05:30
Martin Ender
a2531995f9 Create index.md 2015-12-15 17:21:41 +05:30
Martin Ender
98ccde84fb Create Beispiel.md 2015-12-15 17:21:41 +05:30
CWTGMBH
a12840f803 Create index.md 2015-12-15 17:21:41 +05:30
CWTGMBH
3e2f36034f Delete de 2015-12-15 17:21:41 +05:30
Martin Ender
d8c6213828 Create de 2015-12-15 17:21:41 +05:30
Anand Doshi
dd56b5f4ac Merge pull request #4503 from nabinhait/target_warehouse_patch 
[patch] Repost entries with wrongly selected target warehouse
 2015-12-15 17:01:37 +05:30
Nabin Hait
8444febbda [patch] Repost entries with wrongly selected target warehouse 2015-12-15 15:55:06 +05:30
Anand Doshi
b26c3f2263 Merge pull request #4502 from nabinhait/general_ledger_fix 
[fix][report] General Ledger
 2015-12-15 15:18:20 +05:30
Anand Doshi
03791fceee [translations] 2015-12-15 15:17:11 +05:30
Anand Doshi
542782e400 [fix] delete lead addresses in delete company transactions 2015-12-15 15:17:04 +05:30
Nabin Hait
8bdf8e675f [fix][report] General Ledger 2015-12-15 15:02:04 +05:30
Anand Doshi
2da81732eb Merge pull request #4500 from rmehta/fixes-to-tree 
[fix] rename tree item fixes #2524
 2015-12-15 14:38:26 +05:30
ShashaQin
81b8627250 Update serial_no.json 2015-12-15 14:14:51 +05:30
ShashaQin
79586775b2 Update serial_no.json 
change "delivery_document_type" to Link and ""delivery_document_no" to Dynamic link will be more convenient, like "purchase_document_type" and "purchase_document_no".
 2015-12-15 14:14:26 +05:30
Anand Doshi
8ee5498fe0 [fix] delete lead addresses in delete company transaction 2015-12-15 13:14:38 +05:30
Rushabh Mehta
e8ab320028 [fix] rename tree item fixes #2524 2015-12-15 12:06:37 +05:30
Chris Ian Fiel
c80796cdd5 Cash Flow Report 2015-12-12 11:26:54 +08:00
Chris Ian Fiel
fde03453e4 Cash Flow Report 2015-12-12 10:54:56 +08:00
Chris Ian Fiel
826e18a29f Cash Flow Report 2015-12-12 10:33:01 +08:00
Nabin Hait
660f479ec8 bumped to version 6.12.11 2015-12-11 15:36:29 +06:00
Nabin Hait
fa557f494b Merge pull request #4481 from nabinhait/develop 
[fix] Ignore user permission in target warehouse in SO
 2015-12-11 15:04:38 +05:30
Anand Doshi
695d09f9cd [fix] typo 2015-12-11 15:03:26 +05:30
Anand Doshi
66c9940d73 [fix] [validation] website url should be public 2015-12-11 15:02:58 +05:30
Nabin Hait
204af3ce90 [fix] Ignore user permission in target warehouse in SO 2015-12-11 15:01:02 +05:30
Nabin Hait
83f9f93015 bumped to version 6.12.10 2015-12-11 15:05:41 +06:00
Nabin Hait
53804c5bed Merge pull request #4472 from umairsy/develop 
[docs] Added new videos
 2015-12-11 14:31:35 +05:30
Nabin Hait
d3d4fe45c6 Merge pull request #4473 from nabinhait/sms_logs 
[fix] Ignore permissions while creating sms logs
 2015-12-11 14:31:26 +05:30
Nabin Hait
fc4eca5cc7 [fix] Website Image validation 2015-12-11 11:47:05 +05:30
Rushabh Mehta
a1a712b0c6 [minor] [fix] task close button condition 2015-12-11 11:16:03 +05:30
Nabin Hait
2164595933 [fix] Ignore permissions while creating sms logs 2015-12-10 18:09:57 +05:30
Umair Sayyed
8eaf5eee74 [docs] Added videos 2015-12-10 17:58:12 +05:30
Nabin Hait
9cca3494c0 bumped to version 6.12.9 2015-12-10 15:11:02 +06:00
Nabin Hait
360b057b0a [chnage-log] 2015-12-10 14:37:28 +05:30
Nabin Hait
56ae9481a0 Merge pull request #4466 from rmehta/task-notification-on-overdue 
[enhancement] task status will be set to overdue when it crosses expected end date
 2015-12-10 14:30:34 +05:30
Nabin Hait
12425e22a6 Merge pull request #4462 from nabinhait/sal_slip_fix 
[fix] Payment days calculation in salary slip
 2015-12-10 14:23:31 +05:30
Nabin Hait
da80a649fc Merge pull request #4465 from anandpdoshi/fix/validate-website-image-public 
[fix] validate that Item's website image is public
 2015-12-10 14:23:14 +05:30
Rushabh Mehta
13ec41abb2 [enhancement] task status will be set to overdue when it crosses expected end date 2015-12-10 12:59:02 +05:30
Anand Doshi
b3051ab84d [fix] validate that Item's website image is public 2015-12-10 11:46:20 +05:30
Nabin Hait
533aba02c5 [fix] Payment days calculation in salary slip 2015-12-10 10:50:42 +05:30
Rushabh Mehta
a5cf8a86c1 [minor] lang fixes for email digest 2015-12-10 10:38:46 +05:30
Rushabh Mehta
c819fd4ee8 [translations] for #4461 2015-12-10 10:34:32 +05:30
Anand Doshi
2af44ffd06 [fix] setup wizard is_private 2015-12-09 17:29:11 +05:30
Nabin Hait
5d39a9594d [fix] Reload SO Item in patch 2015-12-09 17:06:09 +05:30
Nabin Hait
7290c79fdf bumped to version 6.12.8 2015-12-09 16:02:30 +06:00
Nabin Hait
547e916b00 Merge pull request #4452 from saurabh6790/drop-ship-fixes-3 
[fixes] pull customer details only if drop shipping is marked
 2015-12-09 15:31:49 +05:30
Nabin Hait
783e63a8e6 suomalainen translation fixed for Extra Small and Large 2015-12-09 15:29:21 +05:30
Saurabh
f6891975d5 [fixes] pull customer details only if drop shipping is marked 2015-12-09 15:04:12 +05:30
Nabin Hait
1b0c797817 bumped to version 6.12.7 2015-12-09 15:29:44 +06:00
Nabin Hait
c119cbcb50 Merge pull request #4449 from nabinhait/coa_fix 
[fix] Stock account identified in COA of Guatamala
 2015-12-09 13:58:09 +05:30
Giovanni Lion
5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english 2015-12-09 15:45:40 +08:00
Nabin Hait
49fe7af6de [fix] Stock account identified in COA of Guatamala 2015-12-09 11:27:10 +05:30
Nabin Hait
3931a35e27 bumped to version 6.12.6 2015-12-08 18:36:25 +06:00
Nabin Hait
56595ecda0 Merge pull request #4445 from nabinhait/patch_fix1 
[patch][fix] Fixed drop ship status and tax rule patch
 2015-12-08 18:05:33 +05:30
Nabin Hait
61c6552434 [fix] Hungary translation for chart of accounts 2015-12-08 18:03:23 +05:30
Nabin Hait
4ad0963ee8 [patch][fix] Fixed drop ship status and tax rule patch 2015-12-08 16:51:04 +05:30
Nabin Hait
d56ec92682 bumped to version 6.12.5 2015-12-08 16:10:17 +06:00
Nabin Hait
694373d022 Fixed conflict 2015-12-08 15:30:15 +05:30
Nabin Hait
40d49ccf98 Merge pull request #4444 from nabinhait/get_incoming_rate_fix 
[fix] Get incoming rate if args as json
 2015-12-08 15:17:32 +05:30
Nabin Hait
4372ac559a Merge pull request #4443 from nabinhait/bank_reco_print 
[fix] Print format for bank reco statement
 2015-12-08 15:17:24 +05:30
Nabin Hait
41c8cf645a [fix] Get incoming rate if args as json 2015-12-08 14:50:24 +05:30
Saurabh
70ed6ede5c [fixes] patch to update delivery status for drop ship item 2015-12-08 14:48:19 +05:30
Nabin Hait
7af5c4aefc [fix] Print format for bank reco statement 2015-12-08 14:25:10 +05:30
Saurabh
01ca354d52 [fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status 2015-12-08 14:03:09 +05:30
Nabin Hait
a974ab3dc5 [fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier 2015-12-08 12:56:14 +05:30
Anand Doshi
cc24d28ddc [fix] address creation for new user 2015-12-08 12:34:13 +05:30
Rushabh Mehta
441b2c7657 [minor] limit pos search to 24 items at a time 2015-12-08 12:16:53 +05:30
Anand Doshi
51d07dfca2 [docs] rename perm level error article 2015-12-07 16:22:57 +05:30
Nabin Hait
6a8ff42a5a bumped to version 6.12.4 2015-12-07 14:54:59 +06:00
Nabin Hait
06db236aa0 [fix] Allow Production Order, by default unchecked in item 2015-12-07 14:19:13 +05:30
Nabin Hait
733680bc3f [translations] 2015-12-07 14:12:41 +05:30
Rushabh Mehta
14a0441b4b [fix] removed temp_highlight 2015-12-07 12:28:03 +05:30
Rushabh Mehta
a311e706b0 [docs] home.png 2015-12-07 12:13:17 +05:30
Rushabh Mehta
e6a16c29df [docs] index fix 2015-12-07 12:07:01 +05:30
Nabin Hait
92bb480fc3 Merge pull request #4432 from bohlian/develop 
Purchase Invoice - Show Payment Button when Outstanding Amount !=0
 2015-12-07 11:12:11 +05:30
Nabin Hait
7dc0da18b5 Merge pull request #4433 from nabinhait/expense_allow_import 
[fix] Allowed import for Expense Claim
 2015-12-07 11:11:35 +05:30
Nabin Hait
c8a2b94200 Merge pull request #4434 from nabinhait/whitelist_fix 
[fix] get_incoming_rate function whitelisted
 2015-12-07 11:11:21 +05:30
Nabin Hait
5eefff13a1 [fix] get_incoming_rate function whitelisted 2015-12-07 10:44:56 +05:30
Nabin Hait
9421e9873a [fix] Allowed import for Expense Claim 2015-12-07 10:40:13 +05:30
bohlian
5e4c8a52ee Payment To Be Shown When Outstanding Amount != 0 
Payment button should be shown when outstanding amount != 0.
 2015-12-07 12:06:08 +08:00
Saurabh
4f39fd243e [fixes] recreate print format, shipping address on po for drop ship, validate update stock 2015-12-06 10:09:06 +05:30
Nabin Hait
c43a11a313 Merge pull request #4431 from nabinhait/leave_fix 
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
 2015-12-05 12:43:38 +05:30
Nabin Hait
1bffb42809 Merge pull request #4428 from nabinhait/get_exchange_rate 
[fix] Get exchange rate as 1 if same currency
 2015-12-05 12:43:13 +05:30
Nabin Hait
4660f820da Merge pull request #4427 from nabinhait/offer_letter_fix 
[fix] Offer letter print format fixed
 2015-12-05 12:42:39 +05:30
Nabin Hait
1a19c05ef0 Merge pull request #4425 from nabinhait/bank_reco_fix 
[fix] Fixed amounts not reflected in bank
 2015-12-05 12:42:20 +05:30
Nabin Hait
d53e780fb8 [fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period 2015-12-05 12:15:49 +05:30
Nabin Hait
0f5d97a156 [fix] Get exchange rate as 1 if same currency 2015-12-04 16:47:34 +05:30
Rushabh Mehta
2f273674e9 [docs] fixed links 2015-12-04 16:00:38 +05:30
Nabin Hait
734a40ad62 [fix] Offer letter print format fixed 2015-12-04 12:19:21 +05:30
Nabin Hait
9547b774f7 [fix] Fixed amounts not reflected in bank 2015-12-04 11:05:25 +05:30
Rushabh Mehta
e1f8b1d695 [minor] [production planning tool] include non production items without default BOM in multi-level BOM 2015-12-04 10:53:15 +05:30
Rushabh Mehta
7be2e985b0 [docs] updated generated docs 2015-12-03 18:28:19 +05:30
Rushabh Mehta
3b6287d849 [docs] updated generated docs 2015-12-03 18:27:13 +05:30
Rushabh Mehta
ab7021ce64 [docs] merged kb and cleanup. warning: don't see the commit 2015-12-03 17:59:34 +05:30
Rushabh Mehta
275b3eec0d bumped to version 6.12.3 2015-12-03 18:28:57 +06:00
Rushabh Mehta
acaef538c2 Merge pull request #4420 from rmehta/stock-entry-fix 
[minor] allow stock entry for manufacture without production order
 2015-12-03 17:58:07 +05:30
Rushabh Mehta
041b062014 Merge pull request #4419 from nabinhait/salary_payment_days 
[fix] Payment Days and holidays considering joining and relieving dates
 2015-12-03 17:57:24 +05:30
Rushabh Mehta
39e603a154 Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate 
Bank transfer exchange rate and account balance in COA
 2015-12-03 17:56:03 +05:30
Nabin Hait
a4eeb919e6 [fix] Set payment days considering joinging date, reliving date and applicable holidays 2015-12-03 15:10:30 +05:30
Nabin Hait
c4d9554a05 [fix] Payment Days and holidays considering joining and relieving dates 2015-12-03 15:10:30 +05:30
Nabin Hait
4c7a32e446 [fix] Toggle required for sales and purchase tax template based on tax type 2015-12-03 11:47:38 +05:30
Rushabh Mehta
2c069a418a [minor] allow stock entry for manufacture without production order 2015-12-03 11:10:23 +05:30
Rushabh Mehta
ba2596a7e0 [minor] validate email id before inviting user 2015-12-03 10:35:11 +05:30
Rushabh Mehta
f7911687a0 [minor] fixes to patch 2015-12-03 08:09:42 +05:30
Rushabh Mehta
5dd1aa9f31 bumped to version 6.12.2 2015-12-02 15:24:45 +06:00
Nabin Hait
8df5900f98 [fix] Inactive salary structure validation 2015-12-02 14:50:08 +05:30
Nabin Hait
f58a3726a7 Balance in chart of accounts in both company and account currency 2015-12-02 12:28:06 +05:30
Nabin Hait
1c77506e80 [fix] Don't overwrite exchange rate on saving for bank transfer 2015-12-02 12:28:06 +05:30
Rushabh Mehta
f1f556c0ac Merge pull request #4409 from nabinhait/reorder_level 
[fix] Reorder Qty mandatory if reorder level entered
 2015-12-02 12:25:09 +05:30
Rushabh Mehta
4a1b9ac793 Merge pull request #4407 from nabinhait/develop 
[fix] Mapping allowed for negative quantity
 2015-12-02 12:24:49 +05:30
Nabin Hait
20abc2d0e8 [fix] Reorder Qty mandatory if reorder level entered 2015-12-01 19:01:19 +05:30
Rushabh Mehta
4496cc1e80 bumped to version 6.12.1 2015-12-01 18:48:28 +06:00
Rushabh Mehta
29cca2352c [hot] [fix] trial balance report 2015-12-01 18:17:33 +05:30
Nabin Hait
d793fc9446 [fix] Mapping allowed for negative quantity 2015-12-01 17:28:12 +05:30
Nabin Hait
5b73dea9f6 [fix] Get items in stock reconciliation based on default warehouse or existing bin 2015-12-01 16:47:17 +05:30
Nabin Hait
c4edcf1532 [fix] Recurring test case fixed for the 1st day of the month 2015-12-01 16:28:35 +05:30
Rushabh Mehta
48b1633ff5 bumped to version 6.12.0 2015-12-01 16:54:13 +06:00
Rushabh Mehta
4140fa59c5 [translations] 2015-12-01 16:02:15 +05:30
Rushabh Mehta
afacc3d779 [minor] catch illegal reference, via error report 2015-12-01 15:53:07 +05:30
Rushabh Mehta
29f9f6c147 [fixes] [ux] get product bundle items only on po, mr and button on toolbar 2015-12-01 11:36:22 +05:30
Rushabh Mehta
37d9d6fdea Merge pull request #4402 from nabinhait/allow_root_accounts 
[feature] Allowed custom root accounts in Chart of Accounts
 2015-12-01 10:59:44 +05:30
Rushabh Mehta
0cc177f73c Merge pull request #4400 from nabinhait/total_amount_in_jv 
[fix] Total Amount in Journal Entry in bank currency
 2015-12-01 10:58:34 +05:30
Nabin Hait
8c4e043747 [feature] Allowed custom root accounts in Chart of Accounts 2015-12-01 10:34:43 +05:30
Nabin Hait
ddc295b4b3 [minor] Set expense account as Stock RBNB for perpetual inventory after mapping 2015-11-30 18:40:28 +05:30
Nabin Hait
621f4cd7c9 [fix] Invoicing against drop-ship Purchase Order 2015-11-30 18:40:28 +05:30
Rushabh Mehta
4750b1fdb7 Merge pull request #4397 from rmehta/setup-wizard-fixes 
[minor] system settings in setup wizard moved to frappe
 2015-11-30 17:17:16 +05:30
Nabin Hait
72e348daf5 [fix] Show 'Make Purchase Receipt' button in PO even if all items are non-stock items 2015-11-30 16:26:49 +05:30
Nabin Hait
6c173e9730 [fix] Total Amount in Journal Entry in bank currency 2015-11-30 16:13:42 +05:30
Nabin Hait
ec1695dbe3 [fix] Bank Reconciliation in account currency 2015-11-30 15:23:46 +05:30
Rushabh Mehta
7909102edd [minor] system settings in setup wizard moved to frappe 2015-11-30 15:12:45 +05:30
Rushabh Mehta
9f7de868ef [fixes] stock reco, must always set qty and rate 2015-11-30 14:16:36 +05:30
Rushabh Mehta
d6c5235d58 [minor] [translation] fix #4343 2015-11-30 11:33:01 +05:30
Rushabh Mehta
32e55e174d [minor] fix error message 2015-11-30 10:51:29 +05:30
Anand Doshi
47e82d1a49 bumped to version 6.11.3 2015-11-27 18:08:46 +06:00
Anand Doshi
563c243ec6 Revert "[hotfix] total amount in journal entry" 
This reverts commit 5b03a75970.
 2015-11-27 17:38:17 +05:30
Anand Doshi
711e675987 bumped to version 6.11.2 2015-11-27 17:54:49 +06:00
Anand Doshi
5b03a75970 [hotfix] total amount in journal entry 2015-11-27 17:24:06 +05:30
Anand Doshi
b8591da62c bumped to version 6.11.1 2015-11-27 15:38:57 +06:00
Anand Doshi
a5f0a7ce06 [change-log] 2015-11-27 15:08:36 +05:30
Rushabh Mehta
9785cd35dc [minor] quote optional in email digest 2015-11-27 14:50:15 +05:30
Anand Doshi
e38a53443a Merge pull request #4386 from rmehta/bank-reco-bulk-edit 
[enhancement] bulk edit in bank reconciliation, #4356
 2015-11-27 14:46:58 +05:30
Anand Doshi
70f57eb7f0 [fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table 2015-11-27 14:38:01 +05:30
Rushabh Mehta
2d70887aaf [enhancement] bulk edit in bank reconciliation, #4356 2015-11-27 11:37:18 +05:30
Anand Doshi
15b22c9d7d Merge pull request #4383 from anandpdoshi/fix/auto-material-request-template 
[fix] Show Item Name in re-order email. Fixes #4381
 2015-11-27 11:31:36 +05:30
Anand Doshi
4b12740e8d [fix] Shipment in portal. Fixes #4291 2015-11-26 18:22:03 +05:30
Anand Doshi
f942d97a18 [fix] removed UOM Replace Utility from message 2015-11-26 16:08:09 +05:30
Anand Doshi
5cf7a0bf72 [fix] Show Item Name in re-order email. Fixes #4381 2015-11-26 15:11:18 +05:30
Anand Doshi
7c016d2ee2 bumped to version 6.11.0 2015-11-26 13:12:06 +06:00
Anand Doshi
666fbaff8c [translations] 2015-11-26 12:40:13 +05:30
Anand Doshi
6674d1dc2b [change-log] 2015-11-26 12:37:52 +05:30
Anand Doshi
5225a9752b Merge pull request #4377 from rmehta/jv-print-fix 
[fix] total amount in journal entry
 2015-11-26 11:05:35 +05:30
Rushabh Mehta
0fd67b23f4 [minor] duplicate button on BOM cancel 2015-11-26 10:37:24 +05:30
Rushabh Mehta
b82bdd6f1f [fix] total amount in journal entry 2015-11-26 09:08:07 +05:30
Rushabh Mehta
131bec67bc Merge pull request #4373 from anandpdoshi/fix/status-updater-after-not-null 
[fix] status update - update qty after int float not null change
 2015-11-25 18:09:13 +05:30
Anand Doshi
ebae726237 [fix] status update - update qty after int float not null change 2015-11-25 17:55:47 +05:30
Anand Doshi
3314f1cba7 Merge pull request #4374 from rmehta/reorder-fix 
[minor] re-order at re-order level, not below
 2015-11-25 17:54:36 +05:30
Anand Doshi
a4870118ea Merge pull request #4365 from anandpdoshi/fix/print-hide-if-0 
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
 2015-11-25 17:28:54 +05:30
Rushabh Mehta
03b3d66b90 [minor] re-order at re-order level, not below 2015-11-25 17:23:00 +05:30
Anand Doshi
5c968abcef [fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0 2015-11-25 16:33:00 +05:30
Anand Doshi
699d9be4b7 Merge pull request #4369 from bohlian/develop 
Removed Warehouse Requirement for SerialNo Listing
 2015-11-25 15:19:47 +05:30
Anand Doshi
ad5cf9b22e Merge pull request #4370 from rmehta/manual-contribs 
[manual] contributions via Robert Becht
 2015-11-25 15:18:56 +05:30
Rushabh Mehta
bf07cba6a8 [manual] contributions via Robert Becht 2015-11-25 14:42:02 +05:30
bohlian
ff1ab26088 Removed Warehouse Requirement for SerialNo Listing 
Removed the requirement that Warehouse has to be assigned for Serial Number to appear in the listing.
 2015-11-25 16:06:20 +08:00
Anand Doshi
5c3469a01e [fix] validate fiscal year dates and company name 2015-11-24 17:06:54 +05:30
Anand Doshi
625592e997 Merge pull request #4363 from anandpdoshi/fix/web-form-customization 
[fix] Changed Country fieldtype to Link in Web Form
 2015-11-24 13:26:23 +05:30
Anand Doshi
7221805587 [fix] Changed Country fieldtype to Link in Web Form 2015-11-23 19:20:51 +05:30
Nabin Hait
cf3cf2ca1f [fix] Update exploded materials table from 'Update Cost' button 2015-11-23 15:12:18 +05:30
Nabin Hait
c4f4c09e42 Get Items from Product Bundle button in purchase cycle 2015-11-23 12:51:37 +05:30
Anand Doshi
fe1e5884b8 Merge pull request #4354 from nabinhait/pcv 
[fix] Period closing account should be of type Liability / Equity
 2015-11-23 12:35:06 +05:30
Nabin Hait
072c540ae3 [fix] Period closing account should be of type Liability / Equity 2015-11-23 09:52:08 +05:30
Anand Doshi
c6d91b8fb2 bumped to version 6.10.2 2015-11-20 18:40:04 +06:00
Anand Doshi
019111b05c [translations] 2015-11-20 18:00:11 +05:30
Anand Doshi
ddad05dab3 [fix] Customer de-duplication sql 2015-11-20 17:29:40 +05:30
Revant Nandgaonkar
bde324a90f fix frappe call to update_purchase_receipt_status 
changed update_purchase_order_status to update_purchase_receipt_status
 2015-11-20 12:41:58 +05:30
Anand Doshi
56c605f36e bumped to version 6.10.1 2015-11-20 01:12:15 +06:00
Anand Doshi
8c56adf42b [hotfix] drop ship patch 2015-11-20 00:41:28 +05:30
Nabin Hait
19ce11aa9c bumped to version 6.10.0 2015-11-19 15:04:29 +06:00
Nabin Hait
f649013079 Merge pull request #4329 from anandpdoshi/int-float-not-null 
[enhancement] Int, Currency, Float, Percent as not null and default to 0
 2015-11-19 14:30:58 +05:30
Anand Doshi
120ea62acc [fix] get_balance_on: convert date to string 2015-11-19 14:24:39 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Nabin Hait
06df19b56a Reload PO Item before patch 2015-11-19 12:46:37 +05:30
Nabin Hait
0f72750fc8 Merge pull request #4338 from anandpdoshi/fix/salary-slip-earning-deduction 
[fix] pull earning and deduction on change of employee
 2015-11-19 12:06:37 +05:30
Nabin Hait
5284b22c53 [fix] Mapping from negative outstanding invoice 2015-11-19 11:42:23 +05:30
Nabin Hait
343c1a5cbd [fix] Mapping from Payment Tool 2015-11-19 11:42:22 +05:30
Anand Doshi
7763bb5c15 [fix] pull earning and deduction on change of employee 2015-11-18 19:04:03 +05:30
Saurabh
b65c69f9eb [fixes] drop ship test case fixes 2015-11-18 17:39:26 +05:30
Saurabh
2e292060c5 [fix] Reserved and ordered qty fix for drop ship orders 2015-11-18 17:39:26 +05:30
Saurabh
a4bf02de6c [fixes] overlapping allocation 2015-11-18 17:39:26 +05:30
Saurabh
3bcf82c7a6 [fixes] test leave allocation record creation 2015-11-18 17:39:26 +05:30
Saurabh
55222a5b82 [fixes] test case fixes 2015-11-18 17:39:26 +05:30
Saurabh
2c85efe31a [fixes] hide drop ship section and typo 2015-11-18 17:39:26 +05:30
Saurabh
20628f5bd8 [patch] mo drop shipment from purchase order to purchase order item 2015-11-18 17:39:25 +05:30
Saurabh
caf122f015 [fixes] dropship fixes 2015-11-18 17:39:25 +05:30
Nabin Hait
b73f3da02c Merge pull request #4332 from nabinhait/pi_fix 
[fix] Check Purchase Receipt mandatory only for stock items
 2015-11-18 17:30:29 +05:30
Nabin Hait
f0607b45c5 Merge pull request #4334 from revant/patch-1 
Mode of Payment validate
 2015-11-18 17:29:54 +05:30
Nabin Hait
b45ca3ada0 Merge pull request #4331 from nabinhait/pcv_fix 
[fix] Allowed Equity accounts in closing account in Period Closing Voucher
 2015-11-18 17:15:57 +05:30
Nabin Hait
11e8728715 Merge pull request #4336 from nabinhait/offer_letter_print_format 
[fix] Don't add pagebreak in print format if terms contains only spaces and newlines
 2015-11-18 17:15:34 +05:30
Rushabh Mehta
edc8ab03b5 [minor] fixed description 2015-11-18 16:48:19 +05:30
Revant Nandgaonkar
27c266b081 improve mode_of_payment validate_accounts 
using frappe.db.get_value instead of frappe.get_list
 2015-11-18 13:28:09 +05:30
Nabin Hait
c7fc11a812 [fix] Don't add pagebreak in print format if terms contains only spaces and newlines 2015-11-18 12:59:00 +05:30
Rushabh Mehta
d962d1c96f [minor] remove feedback line from digest 2015-11-18 10:53:03 +05:30
Revant Nandgaonkar
11f8a0033a Mode of Payment validate 
Error when Same Company is entered multiple times in accounts
Error when Company of Ledger account doesn't match with Company Selected
 2015-11-17 21:15:00 +05:30
Anand Doshi
da79740cdf [fix] injection 2015-11-17 18:27:50 +05:30
Nabin Hait
2cf1699937 [fix] Check Purchase Receipt mandatory only for stock items 2015-11-17 17:32:07 +05:30
Nabin Hait
1a3413875f [fix] Allowed Equity accounts in closing account in Period Closing Voucher 2015-11-17 17:12:44 +05:30
Anand Doshi
3667da1053 [fix] Set user_id as Reply-To in birthday reminder emails 2015-11-16 19:31:20 +05:30
Nabin Hait
d9e57978b8 bumped to version 6.9.2 2015-11-16 18:42:03 +06:00
Nabin Hait
e8f4790d0a [hotfix] 2015-11-16 18:10:15 +05:30
Nabin Hait
6826ca19b1 bumped to version 6.9.1 2015-11-16 17:37:38 +06:00
Nabin Hait
de46fd62d8 Delete v6_9_1.md 2015-11-16 17:06:51 +05:30
Nabin Hait
6f7cd47ac6 [change-log] Added change log 2015-11-16 17:04:48 +05:30
Nabin Hait
94e90bddaa [change-log] Added change log 2015-11-16 17:01:12 +05:30
Nabin Hait
43ce642649 [fix] Uncheck 'Is Production Item' if it is a non-stock item 2015-11-16 16:50:59 +05:30
Nabin Hait
8e2d76bd63 bumped to version 6.9.0 2015-11-16 17:12:56 +06:00
Anand Doshi
34af16140e Merge pull request #4315 from rmehta/standard-in-web-form 
Web form, make standard
 2015-11-16 16:24:14 +05:30
Nabin Hait
b3a68c3f40 Merge pull request #4323 from nabinhait/leaves 
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
 2015-11-16 15:57:04 +05:30
Nabin Hait
9f2fd009b0 Merge pull request #4318 from nabinhait/sal_fix 
[fix] Check Salary Structure validity
 2015-11-16 15:52:52 +05:30
Nabin Hait
3858d12f1d Merge pull request #4317 from nabinhait/close_feature 
Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission
 2015-11-16 15:52:41 +05:30
Nabin Hait
adc93b797a Merge pull request #4316 from nabinhait/advance_fix 
[fix] Invoice Outstanding calculation related to advance
 2015-11-16 15:50:32 +05:30
Nabin Hait
b6de519571 [fix] Test case fixed 2015-11-16 15:50:10 +05:30
Nabin Hait
58c4646199 [fix][cleanup] Leave allocation, application and balance report cleanup and fixes 2015-11-16 15:35:14 +05:30
Anand Doshi
4fbf01fd9d [fix] urlencode address list's link 2015-11-16 15:05:49 +05:30
Anand Doshi
1ed82834ce [fix] re-make setup wizard slides on change of language 2015-11-16 12:58:14 +05:30
Nabin Hait
cd87e76d88 [fix] Check Salary Structure validity 2015-11-15 11:06:55 +05:30
Rushabh Mehta
834b3e6f83 [fix] added missing address hook for website permissions 2015-11-13 14:38:12 +05:30
Nabin Hait
95d025f9aa Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission 2015-11-13 14:22:32 +05:30
Nabin Hait
90c6d7bb47 [fix] Invoice Outstanding calculation related to advance 2015-11-13 14:04:03 +05:30
Nabin Hait
59ba9e3d56 Merge pull request #4314 from anandpdoshi/fix/po-non-stock-receive 
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
 2015-11-13 13:59:04 +05:30
Rushabh Mehta
c1531e7008 [minor] catch SSL error on make_thumbnail, via support 2015-11-13 11:39:38 +05:30
Rushabh Mehta
511421b6a3 [minor] [enhancement] ability to make web-form standard, reload web-forms, merge after https://github.com/frappe/frappe/pull/1405 2015-11-13 11:04:50 +05:30
Rushabh Mehta
26c54bb4fb [minor] new quote 2015-11-13 10:42:20 +05:30
Anand Doshi
d4b05fbd51 bumped to version 6.8.4 2015-11-12 21:07:12 +06:00
Anand Doshi
d65a03d437 [fix] material request type in reorder 2015-11-12 20:36:44 +05:30
Anand Doshi
f774f75c63 bumped to version 6.8.3 2015-11-12 21:05:48 +06:00
Anand Doshi
5f6546c8a5 bumped to version 6.8.2 2015-11-12 20:31:53 +06:00
Anand Doshi
ca5b593e38 [hotfix] setup wizard tax rate 2015-11-12 20:00:50 +05:30
Anand Doshi
cea5479f4d [fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights 2015-11-12 18:39:57 +05:30
Anand Doshi
6303f84d45 [minor] fix test case 2015-11-12 18:11:58 +05:30
Anand Doshi
87c0e9f03a bumped to version 6.8.1 2015-11-12 18:12:41 +06:00
Anand Doshi
d40d1e9a59 [optimize] Payment Reconciliation and Payment Tool 2015-11-12 17:42:05 +05:30
Anand Doshi
3fc1c44334 bumped to version 6.8.0 2015-11-12 17:40:48 +06:00
Anand Doshi
bb347f5afa [translations] 2015-11-12 16:39:58 +05:30
Anand Doshi
938b530ebf [change-log] 2015-11-12 15:44:09 +05:30
Anand Doshi
0b5489ca88 Merge pull request #4312 from nabinhait/delete_uom_replace_utility 
Deleted Stock UOM Replace Utility
 2015-11-12 15:26:41 +05:30
Anand Doshi
adebf31041 Merge pull request #4313 from saurabh6790/doc 
[help-page] drop-shipping documentation
 2015-11-12 15:25:50 +05:30
Saurabh
11cc43a5a6 [help-page] drop-shipping documentation 2015-11-12 12:39:21 +05:30
Nabin Hait
61fb7ee5b8 Deleted Stock UOM Replace Utility 2015-11-12 12:06:47 +05:30
Rushabh Mehta
37b4d75e4a [re-org] setup wizard in frappe 2015-11-12 11:45:47 +05:30
Anand Doshi
f71ecbba2c Merge pull request #4311 from rmehta/auth-rule-cleanup 
Auth rule cleanup
 2015-11-12 11:40:55 +05:30
Anand Doshi
c5c6c0669f [fix] gross profit 2015-11-12 11:07:32 +05:30
Anand Doshi
fe85b2ea17 Merge branch 'nabinhait-erpnext_docs' into develop 2015-11-10 18:59:55 +05:30
Anand Doshi
1c1eb7018c [docs] fixed Linked With and title 2015-11-10 18:58:56 +05:30
Anand Doshi
39982a5f02 bumped to version 6.7.8 2015-11-10 12:01:29 +06:00
Rushabh Mehta
8f228dd7f9 [fix] [minor] closed not in notifications 2015-11-10 11:28:35 +05:30
Rushabh Mehta
739aa4d51a [minor] allow pricing rule to have negative discount 2015-11-09 17:05:12 +05:30
Nabin Hait
f9ef0e4e15 [docs] Fixed ref docs, image and video links 2015-11-09 15:41:45 +05:30
Nabin Hait
fc51ec7f58 [docs] Added existing erpnext manual 2015-11-09 14:40:34 +05:30
Nabin Hait
7ba4d02444 [docs] First commit for docs 2015-11-09 14:40:29 +05:30
Anand Doshi
7489d29813 bumped to version 6.7.7 2015-11-09 13:47:49 +06:00
Anand Doshi
7f77002015 Revert b28573ab03 2015-11-09 13:16:24 +05:30
Anand Doshi
b28573ab03 Merge pull request #4294 from neilLasrado/develop 
[Minor fix] Allowed maintenance schedule to be imported via data import tool
 2015-11-09 13:13:41 +05:30
Anand Doshi
c756ff67b0 Merge pull request #4296 from anandpdoshi/sales-order-allow-delivery 
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
 2015-11-09 13:13:14 +05:30
Anand Doshi
4e72ef1421 [fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox 2015-11-09 13:01:49 +05:30
Neil Trini Lasrado
6b173f3a67 Allowed maintenance schedule to be imported via data import tool 2015-11-09 11:38:06 +05:30
Rushabh Mehta
bbcce8cca0 [minor] [cleanup] cosmetic cleanup and fix to start auth rule, did not do big cleanup 2015-11-09 11:28:51 +05:30
Rushabh Mehta
c438c1dec7 [minor] allow pricing rule to have negative discount 2015-11-07 20:28:43 +05:30
Anand Doshi
64949bfc4b bumped to version 6.7.6 2015-11-07 16:10:22 +06:00
Anand Doshi
438c4fb279 [patch] reload doctype Leave Allocation 2015-11-07 15:38:29 +05:30
Rushabh Mehta
0d7213122a bumped to version 6.7.5 2015-11-06 17:24:17 +06:00
Rushabh Mehta
4268b0092a [minor] don't show po / mr buttons if delivered 2015-11-06 16:52:18 +05:30
Rushabh Mehta
64e31e9a4e [fix] process payroll 2015-11-06 14:47:12 +05:30
Rushabh Mehta
1a8d4b6ea7 bumped to version 6.7.4 2015-11-06 12:15:09 +06:00
Rushabh Mehta
97426776bd Merge pull request #4281 from nabinhait/address_fix 
[fix] Clear addressed and contacts on a new form
 2015-11-06 11:02:31 +05:30
Rushabh Mehta
169089bdde bumped to version 6.7.3 2015-11-06 11:19:53 +06:00
Rushabh Mehta
c14f80838b [fix] [hot] leave allocation patch 2015-11-06 10:49:16 +05:30
Rushabh Mehta
0d58501229 bumped to version 6.7.2 2015-11-06 11:11:06 +06:00
Nabin Hait
7c654cd1bb Leave allocation patch included 2015-11-06 10:37:26 +05:30
Rushabh Mehta
54fc260a42 [minor] trigger link triggers while mapping material request to po to set supplier default currency 2015-11-05 15:26:02 +05:30
Rushabh Mehta
7a39d51366 [fix] pull tax rate in item tax 2015-11-05 15:19:11 +05:30
Nabin Hait
c3ced9a0b5 [fix][report] Buying amount for product bundle in Gross Profit report 2015-11-05 13:13:31 +05:30
Rushabh Mehta
afd3209017 bumped to version 6.7.1 2015-11-05 11:21:31 +06:00
Rushabh Mehta
c541b87bb9 [thumbnail] remove attachment if fails 2015-11-05 10:49:42 +05:30
Rushabh Mehta
6a7edd32aa bumped to version 6.7.0 2015-11-04 18:48:07 +06:00
Rushabh Mehta
fc307970aa [translations] 2015-11-04 18:02:45 +05:30
Rushabh Mehta
b9e7cb02f4 [change-log] 2015-11-04 17:02:13 +05:30
Saurabh
d805bd7daf [fixes] update delivery status 2015-11-04 16:40:09 +05:30
Rushabh Mehta
ac53f2dbb1 [test] [fix] 2015-11-04 15:47:08 +05:30
Rushabh Mehta
20a7d820ab [fix] shot ledger buttons for closed DN / PR 2015-11-04 15:31:41 +05:30
Rushabh Mehta
d48c2394e8 [cleanup] drop ship testing & cleanup 2015-11-04 15:24:04 +05:30
Rushabh Mehta
58101e9e6c Merge pull request #4272 from nabinhait/report-fix1 
[report] Added delay in payment column
 2015-11-04 13:18:42 +05:30
Rushabh Mehta
666131d2fe Merge pull request #4271 from saurabh6790/drop-shipping 
Exclude warehouse from drop ship and re-open status for DN / PR
 2015-11-04 13:18:20 +05:30
Rushabh Mehta
118f043335 Merge pull request #4270 from rmehta/email-digest-fix 
Email digest fixes
 2015-11-04 13:18:08 +05:30
Nabin Hait
b4a51ec80b [report] Added delay in payment column 2015-11-04 13:09:48 +05:30
Saurabh
6197860643 [fixes] test case update 2015-11-04 12:43:40 +05:30
Saurabh
95fbfa4928 [fixes] typo fixes 2015-11-04 12:10:01 +05:30
Saurabh
b7f0a4961e - no delivery / reserve warehouse in drop ship 
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
 2015-11-04 12:03:54 +05:30
Rushabh Mehta
9c044eefff [cleanup] re-arrange drop ship field 2015-11-03 18:28:37 +05:30
Rushabh Mehta
5951692db0 [fix] cleanup stop-resume code 2015-11-03 18:20:39 +05:30
Rushabh Mehta
bd4814fbb7 [fix] email digest periods for weekly and monthly 2015-11-03 16:55:33 +05:30
Rushabh Mehta
7d23e4286e [minor] move item to top in stock module page 2015-11-03 16:25:09 +05:30
Saurabh
c40148e0da [fixes] missing delivered by supplier field 2015-11-03 10:32:46 +05:30
Rushabh Mehta
a9dda232b2 [minor] move item to top in stock module page 2015-11-02 17:47:50 +05:30
Saurabh
12ffd914ee [fixes] args fixes 2015-11-02 16:10:09 +05:30
Rushabh Mehta
b1d8979a59 Merge pull request #4179 from saurabh6790/drop-shipping 
Drop shipping
 2015-11-02 15:43:48 +05:30
Rushabh Mehta
ec2d0030b7 Merge pull request #4265 from nabinhait/jv_fix 
[cleanup] Make Payment Entry from Order/Invoice
 2015-11-02 15:23:01 +05:30
Rushabh Mehta
55d0506155 Merge pull request #4264 from superlack/patch-3 
Update time_log_batch.py
 2015-11-02 15:21:59 +05:30
Rushabh Mehta
5e9b52c273 Merge pull request #4263 from superlack/patch-2 
Update time_log_batch_detail.json
 2015-11-02 15:21:54 +05:30
Rushabh Mehta
00b4663e12 Merge pull request #4262 from saurabh6790/close_pr_dn 
[feature] Close feature for Purchase Receipt and Delivery Note
 2015-11-02 15:21:19 +05:30
Rushabh Mehta
e54a4004ec Merge pull request #4258 from anandpdoshi/fixes-3to6 
[fix] issues encountered migrating from v3/4 to 6
 2015-11-02 15:20:25 +05:30
Rushabh Mehta
d0b086ca54 Merge pull request #4255 from anandpdoshi/slovene-language 
added Slovene and updated translations
 2015-11-02 15:20:17 +05:30
Rushabh Mehta
8d1191ac8f Merge pull request #4252 from anandpdoshi/edge-case-website-variant-selection 
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
 2015-11-02 15:20:10 +05:30
Rushabh Mehta
a938b81e1c Merge pull request #4251 from saurabh6790/hr 
Leave allocation based on Date range
 2015-11-02 15:19:55 +05:30
Saurabh
7cd0ba70d9 [fixes] typo error 2015-11-02 15:18:23 +05:30
Nabin Hait
66340f9894 [cleanup] Make Payment Entry from Order/Invoice 2015-11-02 14:40:47 +05:30
superlack
41f7f7442b Update time_log_batch.py 2015-11-02 00:39:36 -08:00
superlack
126fb31f9a Update time_log_batch_detail.json 2015-11-02 00:38:17 -08:00
Saurabh
a8a91cca16 [feature] Close feature for Purchase Receipt and Delivery Note 2015-11-02 12:57:08 +05:30
Saurabh
381385d19a [fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO 2015-11-02 11:30:51 +05:30
Anand Doshi
aba8fdd18d [fix] issues encountered migrating from v3/4 to 6 2015-10-31 22:49:42 +05:30
Nabin Hait
915778fb69 [fix] Clear addressed and contacts on a new form 2015-10-30 14:43:13 +05:30
Anand Doshi
bacc679df5 [language] added Slovene and updated translations 2015-10-30 12:54:27 +05:30
Anand Doshi
b0388d971a [minor] reduced size of video placeholder 2015-10-30 12:54:10 +05:30
Saurabh
61c9ea938d [Change Log] change log entry for drop shipment 2015-10-30 12:02:24 +05:30
Saurabh
6956eee790 [fixes] test case and code rewrite 2015-10-29 19:43:35 +05:30
Saurabh
2e65aadb1e [fixes] reload doc after status update and supplier address fetching 2015-10-29 19:43:35 +05:30
Saurabh
653cffec1e [change_log and fixes] set print hide, add change_log 2015-10-29 19:43:35 +05:30
Saurabh
cc8f1afa56 [fixes] test case fixes for drop shipping 2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32 [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier 2015-10-29 19:43:35 +05:30
Saurabh
f857d81f35 [fixes]test case to check updated delivered qty 2015-10-29 19:43:34 +05:30
Saurabh
6d64fe378d [fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1 2015-10-29 19:43:34 +05:30
Saurabh
b0ab93f779 [fixes] typo error 2015-10-29 19:43:34 +05:30
Saurabh
df1c1a573f [fixes] test case for per_ordered 2015-10-29 19:43:34 +05:30
Saurabh
a1f2aec918 [fixes] check ordered and reserved qrt, check closed status for so and po 2015-10-29 19:43:34 +05:30
Saurabh
d8930a776d [fixes] test case import fix 2015-10-29 19:43:34 +05:30
Saurabh
8a8ef85174 [fixes] reviwe fixes 2015-10-29 19:43:33 +05:30
Saurabh
edba048c14 [fixes] set is_stock_item for test items 2015-10-29 19:43:33 +05:30
Saurabh
b705798ccb [enhance & fixes] Print Format on PO for Drop Shipping 2015-10-29 19:43:33 +05:30
Saurabh
5e0b0b4b97 [enhance] make PO from SO if supplier is specified 2015-10-29 19:43:33 +05:30
Saurabh
a4efbf0db7 [fixes] check for close status 2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e [fixes] filter on supplier list for DropShip, checking closed status 2015-10-29 19:43:33 +05:30
Saurabh
99543f72d8 [fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list 2015-10-29 19:43:32 +05:30
Saurabh
1a9646739a [fixes][rename-field-name] drop_ship to is_drop_ship 2015-10-29 19:43:32 +05:30
Saurabh
bd65cb8817 [fixes] field rename and test case for drop ship 2015-10-29 19:43:32 +05:30
Saurabh
98b287565a [enhance] close purchase order 2015-10-29 19:43:32 +05:30
Saurabh
c6dbe70256 [Fixes] Drop Shipping 2015-10-29 19:43:32 +05:30
Saurabh
556536615e [minor fix] Status fix in listview 2015-10-29 19:43:31 +05:30
Saurabh
8bd96f1c08 [Test Case] Test case to check drop shipping 2015-10-29 19:43:31 +05:30
Saurabh
5b7e9a1c94 [minor fixes] 2015-10-29 19:43:31 +05:30
Saurabh
c306b21415 [merge fixes] 2015-10-29 19:43:31 +05:30
Anand Doshi
c39cef363c [fix] stop welcome video if user moves to another page 2015-10-29 18:37:17 +05:30
Nabin Hait
02a56b4e1a bumped to version 6.6.7 2015-10-29 17:05:06 +06:00
Nabin Hait
9a6df0341f Merge pull request #4246 from anandpdoshi/welcome-to-erpnext 
Show Welcome to ERPNext after completing Setup Wizard
 2015-10-29 16:29:10 +05:30
Anand Doshi
7dab3c1f85 Show Welcome to ERPNext after completing Setup Wizard 2015-10-29 15:32:00 +05:30
Nabin Hait
f9a974385a [fix] Consider Rejected Qty for Qty validation in Purchase Receipt 2015-10-29 14:54:29 +05:30
Saurabh
20a653e829 [fixes] Test case fixes for leave application 2015-10-29 14:27:57 +05:30
Saurabh
a2c668cb77 [fixes] patch, test cases and validations 2015-10-29 14:27:57 +05:30
Saurabh
d0b0a80be3 [enhacement] remove fiscal year from leave allocation 2015-10-29 14:27:57 +05:30
Anand Doshi
532b9e8bfb [fix] Edge case in variant selection in website - when variant has less number of attributes than template 2015-10-29 13:20:07 +05:30
Anand Doshi
21e09a2bd8 [enhancement] Ability to disable an Item 2015-10-29 12:39:47 +05:30
Nabin Hait
1aa6e98136 Merge pull request #4249 from nabinhait/cc_fix 
[fix] Default cost center as per company
 2015-10-29 12:28:20 +05:30
Nabin Hait
8372c44262 [fix] Default cost center as per company 2015-10-29 11:50:36 +05:30
Anand Doshi
6d69ca6bac [fix] don't show expired items in website item list. Fixes #4210. 2015-10-29 11:35:16 +05:30
Nabin Hait
4757d0634a bumped to version 6.6.6 2015-10-28 16:37:13 +06:00
Nabin Hait
dc8ce7f7e9 Merge pull request #4245 from nabinhait/sr_no 
[fix] Serial No query in Warranty Claim
 2015-10-28 15:51:32 +05:30
Nabin Hait
a90a0528aa Fixed conflict 2015-10-28 15:50:26 +05:30
Nabin Hait
350f9592d3 Merge pull request #4237 from sbkolate/develop 
[minor] Update Help Video Links in Buying, CRM, Selling  #4233
 2015-10-28 15:44:39 +05:30
Nabin Hait
43e50de6ef Merge pull request #4243 from nabinhait/last_pur_rate 
[patch] Deleted Item-wise Last Purchase Rate report
 2015-10-28 15:42:35 +05:30
Nabin Hait
a530f410e3 Merge pull request #4242 from nabinhait/to_warehouse_dn 
[fix] Ignore users permission for To Warehouse field in Delivery Note
 2015-10-28 15:42:16 +05:30
Nabin Hait
bdfb070ed6 [fix] Serial No query in Warranty Claim 2015-10-28 15:38:22 +05:30
Anand Doshi
caa9fc033f [hotfix] vietnamese translation for Debit Note 2015-10-28 14:34:48 +05:30
Nabin Hait
15bf4e5599 [patch] Deleted Item-wise Last Purchase Rate report 2015-10-28 12:48:32 +05:30
Nabin Hait
6d490e530a [fix] Ignore users permission for To Warehouse field in Delivery Note 2015-10-28 12:43:45 +05:30
Sambhaji Kolate
fd53991dfa [minor] Update Help Video Links in Buying, CRM, Selling #4233 2015-10-27 17:01:27 +05:30
Anand Doshi
c794ca53fb [fix] delete file records created via item.py even if website_image file didn't exist 2015-10-27 16:56:42 +05:30
Nabin Hait
99f4b43641 bumped to version 6.6.5 2015-10-27 11:59:35 +06:00
Nabin Hait
fdeab29e94 Removed console.log 2015-10-27 11:23:43 +05:30
Nabin Hait
31755b485f Merge pull request #4232 from anandpdoshi/variant-smart-selection 
Numeric attribute selector, smart selection of variant based on attribute combinations
 2015-10-27 11:22:54 +05:30
Anand Doshi
3f3696d1eb [enhancement] [website] numeric attribute selector, smart selection of variant based on attribute combinations 2015-10-26 21:55:34 +05:30
Nabin Hait
6c6f3789d0 [fix] Is POS trigger 2015-10-26 18:01:12 +05:30
Nabin Hait
044c43a5cb Merge pull request #4230 from nabinhait/fix26 
minor fix
 2015-10-26 17:43:17 +05:30
Nabin Hait
83e68bb837 minor fix 2015-10-26 17:40:31 +05:30
Nabin Hait
415df04834 [fix] Account Type in Chart of Accounts 2015-10-26 16:43:09 +05:30
Nabin Hait
6d2d6862d6 Merge pull request #4228 from nabinhait/exchange_rate 
[fix] account currency is not mandatory in get exchange rate
 2015-10-26 15:27:19 +05:30
Nabin Hait
13a65d52dd Merge pull request #4226 from nabinhait/email_digest 
[fix] Events in Email Digest
 2015-10-26 14:47:09 +05:30
Nabin Hait
6485d4a749 [fix] account currency is not mandatory in get exchange rate 2015-10-26 14:31:17 +05:30
Nabin Hait
2e63c80523 Merge pull request #4220 from nabinhait/fix21 
Don't delete tax template and pos profile while deleting company transactions
 2015-10-26 14:14:44 +05:30
Nabin Hait
23bd21778e [fix] Events in Email Digest 2015-10-26 14:14:09 +05:30
Nabin Hait
a3f490890d Merge pull request #4227 from nabinhait/dn_to_wh 
[fix] Label changed for Target Warehouse in Delivery Note
 2015-10-26 13:02:59 +05:30
Nabin Hait
8e3ea32d6d Merge pull request #4222 from nabinhait/tax_rule 
Set tax rule based on date
 2015-10-26 13:02:21 +05:30
Nabin Hait
c4a1a943ef Merge pull request #4221 from nabinhait/fix22 
[fix] Value mapping while making bank entry from Expense Claim
 2015-10-26 13:00:52 +05:30
Nabin Hait
abc0b64b68 [fix] Label changed for Target Warehouse in Delivery Note 2015-10-26 11:58:43 +05:30
Nabin Hait
00818bfa90 Set tax rule based on date 2015-10-23 16:26:09 +05:30
Anand Doshi
b9bfe6117e [optimization] Stock Projected Qty report 2015-10-23 14:49:09 +05:30
Nabin Hait
7a9f46d9d1 [fix] Value mapping while making bank entry from Expense Claim 2015-10-23 13:19:01 +05:30
Nabin Hait
a10b52c6e6 Don't delete tax template and pos profile while deleting company transactions 2015-10-23 13:02:55 +05:30
Rushabh Mehta
5033e7b431 [hot] fix stock projected qty 2015-10-23 10:51:56 +05:30
Rushabh Mehta
e6791ee78e [fix] digest values in absolute 2015-10-23 10:39:46 +05:30
Anand Doshi
1c501b6aac bumped to version 6.6.4 2015-10-22 22:32:59 +06:00
Anand Doshi
9a2a6d8fcb [hotfix] setup wizard is_pro_application if not service 2015-10-22 22:02:22 +05:30
Anand Doshi
0fbf10797c bumped to version 6.6.3 2015-10-22 22:29:21 +06:00
Anand Doshi
58344cbb81 [hotfix] setup wizard is_pro_application if not service 2015-10-22 21:57:13 +05:30
Anand Doshi
b64b461d53 bumped to version 6.6.2 2015-10-22 20:06:09 +06:00
Anand Doshi
0b93bdcf40 [fix] get_party_gle_currency caching 2015-10-22 19:33:08 +05:30
Anand Doshi
0af146cea6 bumped to version 6.6.1 2015-10-22 19:23:19 +06:00
Anand Doshi
683f756d0f [fix] Fetch company of employee in leave application 2015-10-22 18:52:15 +05:30
Anand Doshi
d905204e49 [fix] Update expense account in old purchase invoices if missing 2015-10-22 18:49:08 +05:30
Anand Doshi
d8bc40d7f0 [fix] party gle currency validation 2015-10-22 17:55:22 +05:30
Anand Doshi
f9f0e2591f bumped to version 6.6.0 2015-10-22 17:42:00 +06:00
Anand Doshi
5810bf70c7 [change-log] 2015-10-22 17:02:44 +05:30
Nabin Hait
fbe08ec7d0 Period Closing Voucher Test Cases 2015-10-22 16:21:37 +05:30
Nabin Hait
0045c305ac Period Closing Voucher as per multi currency 2015-10-22 16:21:37 +05:30
Anand Doshi
5dd0fb6e2a Merge pull request #4213 from nabinhait/serial_no_fix 
[fix] For Serial No Status
 2015-10-22 15:25:11 +05:30
Anand Doshi
e99fff8d08 Merge pull request #4212 from anandpdoshi/leave-application-js-clenup 
[minor] leave application cleanup
 2015-10-22 15:19:57 +05:30
Nabin Hait
398c83afa5 [fix] For Serial No Status 2015-10-22 15:11:44 +05:30
Anand Doshi
c346484ca4 [minor] leave application cleanup 2015-10-21 19:56:14 +05:30
Nabin Hait
70b7f7f036 minor improvement in patch 2015-10-21 17:40:06 +05:30
Nabin Hait
31c51ef914 [fix] test case for purchase invoice gle 2015-10-21 17:40:06 +05:30
Nabin Hait
be464696cc [fix][patch] Fix wrong gle for Purchase Invoice against Expenses Included in Valuation account 2015-10-21 17:40:06 +05:30
Anand Doshi
191b2970e9 [translations] updated 2015-10-21 16:59:33 +05:30
Anand Doshi
c50f033722 [language] Added Ukranian language - українська. Closes frappe/translator#57 2015-10-21 16:59:32 +05:30
Anand Doshi
e1e1414894 Merge pull request #4195 from anandpdoshi/journal-entry-posting-date 
[enhancement] Quick Entry in Journal Entry, remember Posting Date
 2015-10-21 16:50:40 +05:30
Anand Doshi
d1441245fb [fix] variant website page render 2015-10-21 16:36:43 +05:30
Anand Doshi
87da662703 [enhancement] Quick Entry in Journal Entry, remember Posting Date 2015-10-21 16:27:13 +05:30
Anand Doshi
99ba924303 Merge pull request #4207 from rmehta/rename-tool 
[feature] rename via console merge with frappe/frappe#1349
 2015-10-21 14:27:49 +05:30
Anand Doshi
066ff9599a Merge pull request #4206 from neilLasrado/variant 
Prevent Template Item from going into infinite loop while saving
 2015-10-21 14:20:49 +05:30
Rushabh Mehta
33ebaf479d [feature] rename via console merge with frappe/frappe#1349 2015-10-21 12:26:37 +05:30
Neil Trini Lasrado
3a573d1a6d Prevent Template Item from going into infinite loop while saving 2015-10-21 12:20:06 +05:30
Rushabh Mehta
7f66983309 [minor] added column type definition in batch-wise balance history 2015-10-21 12:04:27 +05:30
Rushabh Mehta
2c867fdd73 [fix] email digest cache 2015-10-21 11:13:40 +05:30
Anand Doshi
95dfc2730b [fix] re-run thumbnail patch 2015-10-20 19:03:30 +05:30
Anand Doshi
558646c6b8 [fix] ignore mandatory when creating customer and contact in cart 2015-10-20 18:57:38 +05:30
Anand Doshi
ea0d98891f [minor] don't display missing file doc message in item's make thumbnail 2015-10-20 18:57:38 +05:30
Anand Doshi
2678135f5e bumped to version 6.5.3 2015-10-20 19:05:49 +06:00
Anand Doshi
25ef4ff373 [fix] variant selector display 2015-10-20 18:34:21 +05:30
Anand Doshi
3c3d69f905 bumped to version 6.5.2 2015-10-20 18:23:37 +06:00
Anand Doshi
aed8da40ae Merge pull request #4198 from nabinhait/mc_fix 
[fix] Set higher precision for debit, credit and exchange rate field
 2015-10-20 17:46:22 +05:30
Anand Doshi
3bc43682f1 Merge pull request #4199 from neilLasrado/item 
Default value of allow production order in Item master changed to 1
 2015-10-20 17:44:26 +05:30
Anand Doshi
7c0eadb451 [fix] Patch template item to be shown in website, show variant's description and price on change of attribute 2015-10-20 17:30:02 +05:30
Neil Trini Lasrado
d4357e80d7 Fixed Test Cases 2015-10-20 16:21:02 +05:30
Neil Trini Lasrado
c0f88e4caf Default value fot allow production order in Item master changed to 1 2015-10-20 15:51:04 +05:30
Anand Doshi
73286dd9f5 [minor] define email field for Issue 2015-10-20 14:53:22 +05:30
Anand Doshi
7b2b0cd73c [fix] Item Re-order if Bin does not exists and fixed Stock Projected Qty report to show per Warehouse Re-order level 2015-10-20 14:29:47 +05:30
Anand Doshi
2c749db2a9 Merge pull request #4196 from neilLasrado/develop 
Fixed issue in Item Variant for Numeric Attributes
 2015-10-20 14:28:16 +05:30
Anand Doshi
17c633d00f [fix] Set fieldtype of description field as Text Editor in Landed Cost Item 2015-10-20 14:26:44 +05:30
Neil Trini Lasrado
a4fad72a65 Considered greater precision of value and increment (better code) 2015-10-20 12:20:49 +05:30
Neil Trini Lasrado
e65ac00f36 Considered greater precision of value and increment 2015-10-20 12:20:49 +05:30
Neil Trini Lasrado
75bd0f7cfe Fixed issue in Item Variant for Numeric Attributes 2015-10-20 12:20:49 +05:30
Nabin Hait
4d20f3029b [fix] Set fieldtype of description field as Text in Landed Cost Item 2015-10-20 12:18:19 +05:30
Nabin Hait
c35b35abca [fix] Set higher precision for exchange rate field 2015-10-20 12:11:51 +05:30
Anand Doshi
17dc249841 [fix] rollback if exception in bulk rename 2015-10-20 12:11:26 +05:30
Anand Doshi
12af47918d [fix] rename tool 2015-10-20 12:02:39 +05:30
Anand Doshi
84ca0197e4 Merge pull request #4197 from saurabh6790/fixes 
[minor][fix] set default fiscal year for holiday list calendar view
 2015-10-20 11:40:00 +05:30
Anand Doshi
3395e7a2e4 [fix] Daily digest date format 2015-10-20 08:48:43 +05:30
Anand Doshi
25956d6282 [fix] Item thumbnail 2015-10-20 08:48:43 +05:30
Saurabh
ba2133cba2 [minor][fix] set default fiscal year for holiday list calendar view 2015-10-19 19:20:11 +05:30
Anand Doshi
414660313a bumped to version 6.5.1 2015-10-19 19:40:58 +06:00
Anand Doshi
c52a601e87 Merge pull request #4189 from nabinhait/dn_target_wh_testcase 
Test case fixed for swtiching valuation method
 2015-10-19 19:09:27 +05:30
Anand Doshi
7a869b0dca [hotfix] print in patch 2015-10-19 17:33:40 +05:30
Nabin Hait
6f64a78ecf Test case fixed for swtiching valuation method 2015-10-19 16:53:35 +05:30
Nabin Hait
608bbc7850 Test case fixed for swtiching valuation method 2015-10-19 16:53:35 +05:30
Anand Doshi
16b2c51988 bumped to version 6.5.0 2015-10-19 17:00:33 +06:00
Anand Doshi
76e9ba1e76 [change-log] 2015-10-19 16:03:34 +05:30
Anand Doshi
9dad86c189 Merge pull request #4190 from nabinhait/income_expense_account_query 
[fix] Allowed accounts with account type='Income Account' for default income account in item
 2015-10-19 15:43:32 +05:30
Anand Doshi
5302b46955 Merge pull request #4183 from nabinhait/multi_currency_fix 
Multi currency fix
 2015-10-19 15:32:24 +05:30
Nabin Hait
afd14f6f0e [fix] Allowed accounts with account type='Income Account' for default income account in item 2015-10-19 15:27:58 +05:30
Anand Doshi
05584d6d8b Merge pull request #4191 from rmehta/email-digest-quotes 
[enhancement] add a quote with email digest
 2015-10-19 15:18:20 +05:30
Nabin Hait
aa015902d5 Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Nabin Hait
2873f2e7de Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Anand Doshi
b4e9c1da64 [fix] thumbnail generation for item 2015-10-19 12:57:19 +05:30
Anand Doshi
1d093a4039 [fix] change attach fields to small text 2015-10-19 12:56:29 +05:30
Rushabh Mehta
fe9717cb9c [enhancement] add a quote with email digest 2015-10-19 12:35:07 +05:30
Anand Doshi
d665a07621 [fix] remove label 'Column Break' 2015-10-16 15:44:28 +05:30
Rushabh Mehta
2a1ba886f1 [patch-fix] 2015-10-15 16:56:53 +05:30
Rushabh Mehta
55f1ea05da [release] Added change log 2015-10-15 16:32:36 +05:30
Rushabh Mehta
2e7f9d2b8f [fixes] email digest 2015-10-15 16:31:16 +05:30
Rushabh Mehta
3a519f269d Merge pull request #4175 from anandpdoshi/dynamic-linked-with 
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
 2015-10-15 14:25:18 +05:30
Rushabh Mehta
4c0d0793a3 Merge pull request #4174 from saurabh6790/shopping_cart 
[fix] order.html rate display
 2015-10-15 14:01:46 +05:30
Rushabh Mehta
d3b8a74508 [test] fix, force values in target warehouse too 2015-10-15 13:23:10 +05:30
Anand Doshi
77760db89c [fix] strip whitespace in setup wizard args 2015-10-15 12:54:40 +05:30
Anand Doshi
1d23ebb51d [fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339 2015-10-15 12:54:40 +05:30
Rushabh Mehta
ba5b0e8458 [test] [fix] print values for failing test 2015-10-15 12:45:42 +05:30
Rushabh Mehta
14a908bdec [test] [fix] abs(valuation_rate) for moving average 2015-10-15 12:28:20 +05:30
Rushabh Mehta
9f436a7c71 [fix] [exchange-rate] let user defined exchange rate take preceedence 2015-10-15 11:57:46 +05:30
Rushabh Mehta
746fd90625 [fix] [exchange-rate] let user defined exchange rate take preceedence 2015-10-15 11:50:38 +05:30
Rushabh Mehta
f861856ed9 [fix] do not check purchase invoice uniqueness for cancelled documents 2015-10-15 11:37:34 +05:30
Rushabh Mehta
f94f153078 [test] fixes 2015-10-15 11:31:59 +05:30
Rushabh Mehta
c9bacedbfe [test] fixes 2015-10-15 11:00:34 +05:30
Saurabh
c0cee82727 [small fixes] frozen customer testcase 2015-10-14 18:03:07 +05:30
Saurabh
4c53931363 [fixes and test case] test case to avoid duplicate customer name exection 2015-10-14 18:03:07 +05:30
Saurabh
53f7e6281c [fix] Duplicate Customer Name Error 2015-10-14 18:03:07 +05:30
Saurabh
9f235b891f [fix] order.html rate display 2015-10-14 18:03:07 +05:30
Rushabh Mehta
c4d4c7feb0 [fix] repost_actual_qty fix 2015-10-14 17:37:28 +05:30
Rushabh Mehta
ee6862b277 [fix] VARCHAR lengths as 140 2015-10-14 17:28:35 +05:30
Rushabh Mehta
fb73151da6 [fixes] 2015-10-14 16:22:01 +05:30
Rushabh Mehta
6e322d0a02 [enhancement] use thumbnails in grid views, patch to make thumbnails 2015-10-14 16:21:24 +05:30
Rushabh Mehta
73e73795f1 [minor] Added 'Invite User' in Contact 2015-10-14 16:20:39 +05:30
Rushabh Mehta
80d2a55342 [enhancement] add variants in website 2015-10-14 16:16:00 +05:30
Anand Doshi
41dd2c458b [minor] pass does not exist error 2015-10-14 16:13:49 +05:30
Anand Doshi
71ebad5668 Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error 2015-10-14 16:13:49 +05:30
Rushabh Mehta
73f1dc4edf [cleanup] added unsubscribe to email digest 2015-10-14 15:53:37 +05:30
Rushabh Mehta
174299124f [cleanup] [wip] email digest 2015-10-14 15:53:37 +05:30
Rushabh Mehta
c27748b2b3 Merge pull request #4040 from nabinhait/dn_target_warehouse 
Delivery to target warehouse
 2015-10-14 15:29:54 +05:30
Rushabh Mehta
626ba1bb81 [translations] added bn, da-DK, es-PE, si 2015-10-14 15:24:42 +05:30
Nabin Hait
38e4c6f2af Allow same serial nos for raw materials and fg item in repack / manufacture entry 2015-10-13 18:37:39 +05:30
Neil Trini Lasrado
58e9590850 Fixed issues with Permissions in Company Doctype 2015-10-13 17:45:43 +05:30
Nabin Hait
03afb45e34 [fix] Validate deletion of serial no 2015-10-13 15:46:42 +05:30
Nabin Hait
d91382dbf3 [fix] serial no status 2015-10-13 15:46:42 +05:30
Nabin Hait
e07958bbda Change log and sopnsors for delivery to target warehouse 2015-10-13 15:46:42 +05:30
Nabin Hait
b445be3552 Test case for delivery to target warehouse 2015-10-13 15:46:42 +05:30
Nabin Hait
c865f229fb Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status 2015-10-13 15:46:42 +05:30
Neil Trini Lasrado
ec5deb6e48 Changed label in Company 2015-10-13 15:28:12 +05:30
Neil Trini Lasrado
486bf2e113 Added Change Log 2015-10-13 15:17:53 +05:30
Neil Trini Lasrado
f49b085625 Allowed Income account to be added to Cost Center 2015-10-13 14:54:39 +05:30
Rushabh Mehta
4f4fc45ae6 bumped to version 6.4.7 2015-10-13 15:16:15 +06:00
Rushabh Mehta
86125b2b9f [fix] sales order status for maintenance 2015-10-13 12:31:05 +05:30
Rushabh Mehta
22d0d586ab [minor] [typo] 2015-10-13 12:30:21 +05:30
Rushabh Mehta
eb62aed8c7 Merge pull request #4157 from nabinhait/bin 
[fix][patch] Delete duplicate bins
 2015-10-12 18:39:16 +05:30
Rushabh Mehta
60f1739ca5 Merge pull request #4158 from rmehta/journal-entry-title-fix 
[fix] set title in Journal Entry only if not set
 2015-10-12 18:35:49 +05:30
Rushabh Mehta
5f349a67c9 Merge pull request #4156 from rmehta/item-section-fix 
[fix] [minor] collapsible section for Item - removed custom script
 2015-10-12 18:35:38 +05:30
Rushabh Mehta
fd294eb981 Merge pull request #4154 from rmehta/sales-analytics-fix 
[minor] [fix] Use customer_name in Sales Analytics
 2015-10-12 18:32:39 +05:30
Rushabh Mehta
d256055a8c Merge pull request #4153 from rmehta/stock-entry-fix 
[fix] [minor] stock_entry.py error for None qty
 2015-10-12 18:32:28 +05:30
Rushabh Mehta
cefa106a06 Merge pull request #4151 from anandpdoshi/purchase-invoice-letterhead 
[fix] Added Letter Head field to Purchase Invoice
 2015-10-12 18:30:25 +05:30
Rushabh Mehta
67ecfcf52c Merge pull request #4148 from saurabh6790/erp_support 
[minor fix], escape % char
 2015-10-12 18:30:13 +05:30
Nabin Hait
b7e46c4ed9 [fix][patch] Delete duplicate bins 2015-10-12 18:28:50 +05:30
Rushabh Mehta
bc5ecfff06 Merge pull request #4146 from nabinhait/fix10 
[fix] Multiple minor fixes
 2015-10-12 18:27:02 +05:30
Rushabh Mehta
8fa4845d00 [fix] set title in Journal Entry only if not set 2015-10-12 16:59:52 +05:30
Rushabh Mehta
d4882653c3 [fix] [minor] collapsible section for Item - removed custom script 2015-10-12 16:45:53 +05:30
Anand Doshi
9a4d165ba2 [fix] get_party_details.js - set posting_date if args are initialised 2015-10-12 16:23:51 +05:30
Rushabh Mehta
a7099eaa8d [minor] [fix] Use customer_name in Sales Analytics 2015-10-12 16:22:10 +05:30
Anand Doshi
4b72d05793 [fix] get allocated_percentage from party's sales team 2015-10-12 16:15:52 +05:30
Rushabh Mehta
a30f3ea1f9 [fix] [minor] stock_entry.py error for None qty 2015-10-12 16:12:52 +05:30
Anand Doshi
4fa69780a8 [fix] Added Letter Head field to Purchase Invoice 2015-10-12 15:55:24 +05:30
Rushabh Mehta
2dc619ae1f [fix] copy task titles with project 2015-10-12 15:55:12 +05:30
Nabin Hait
fc9031924e [fix] Field type of Age field converted to Int 2015-10-12 15:47:07 +05:30
Saurabh
e14124198d minor fix, escape % char 2015-10-12 15:08:09 +05:30
Nabin Hait
51e980dd2c [fix] Multiple minor fixes 2015-10-10 18:10:05 +05:30
Rushabh Mehta
c03cba9d17 [fix] sales order notification 2015-10-08 11:46:32 +05:30
Nabin Hait
9801745090 bumped to version 6.4.6 2015-10-07 17:57:23 +06:00
Anand Doshi
7866c6e6db [fix] modified in sales order and purchase order 2015-10-07 17:26:19 +05:30
Nabin Hait
4c502bcd26 bumped to version 6.4.5 2015-10-07 15:10:32 +06:00
Nabin Hait
714948c867 Merge pull request #4136 from nabinhait/uom 
[fix] Fetch UOM Conversion Factor from template if not specified in variants
 2015-10-07 14:30:18 +05:30
Nabin Hait
8f3b360f83 Merge pull request #4133 from saurabh6790/erp_support 
Calendar view for holiday listing
 2015-10-07 14:29:38 +05:30
Nabin Hait
314086d6c0 [fix] Fetch UOM Conversion Factor from template if not specified in variants 2015-10-07 11:55:08 +05:30
Nabin Hait
bcd655a985 Merge pull request #4109 from rmehta/fix-sales-purchase-order-status 
[fix] sales & purchase order status
 2015-10-07 11:34:30 +05:30
Saurabh
b0dbdc1439 minor fixes 2015-10-07 11:27:25 +05:30
Nabin Hait
37b0bf257d Merge pull request #4117 from nabinhait/sample_data 
[fix] Create sample opportunity and quotation only if Customer exists
 2015-10-07 11:25:50 +05:30
Nabin Hait
c5a25f44e1 Merge pull request #4119 from nabinhait/fix3 
[fix] Return account currency only if account provided
 2015-10-07 11:25:19 +05:30
Nabin Hait
8dafa376ab Merge pull request #4123 from nabinhait/fix4 
[fix] allowed more than 2 currencies in Journal Entry
 2015-10-07 11:24:45 +05:30
Saurabh
74eb8e34da [Fixes] minor fix for fiscal year in holiday list 2015-10-07 11:17:14 +05:30
Nabin Hait
5c66fb7631 Merge pull request #4130 from nabinhait/reports 
[fix][report] Left join used in pending reports
 2015-10-07 11:15:36 +05:30
Nabin Hait
be3b3b2107 Merge pull request #4132 from nabinhait/credit_limit 
minor fix in credit limit
 2015-10-07 11:15:02 +05:30
Nabin Hait
8a7bdd5a92 [fix] Valuation Rate in Stock Balance report 2015-10-06 18:46:56 +05:30
Saurabh
1d753c92b1 Calendar view for holiday listing 2015-10-06 15:21:23 +05:30
Nabin Hait
54ecc8ebba minor fix in credit limit 2015-10-06 14:28:41 +05:30
Nabin Hait
f4edaef481 [fix][report] Left join used in pending reports 2015-10-06 12:48:04 +05:30
Nabin Hait
ebbd163903 [fix] allowed more than 2 currencies in Journal Entry 2015-10-05 13:21:38 +05:30
Nabin Hait
8954b24b22 [fix] Return account currency only if account provided 2015-10-04 12:27:46 +05:30
Nabin Hait
ae92fc7f35 [fix] Create sample opportunity and quotation only if Customer exists 2015-10-03 13:42:44 +05:30
Rushabh Mehta
0bc3ca02f3 [fix] default contact for website 2015-10-03 12:08:43 +05:30
Rushabh Mehta
d10ba853e6 [fix] sales & purchase order status 2015-10-02 17:16:51 +05:30
Anand Doshi
789a798e36 bumped to version 6.4.4 2015-10-02 17:05:36 +06:00
Nabin Hait
fbef1fdf3a Minor fix 2015-10-02 16:26:18 +05:30
Nabin Hait
7a287a9153 [patch] Fix affected Journal Entries due to reconciliation 2015-10-02 16:00:42 +05:30
Anand Doshi
71f23acc2b bumped to version 6.4.3 2015-10-02 13:13:27 +06:00
Anand Doshi
1a1f790150 [fix] test case 2015-10-02 12:34:18 +05:30
Rushabh Mehta
3c54e9779b Merge pull request #4108 from nabinhait/payment_reco 
[fix] Payment Reconciliation in multi-currency
 2015-10-02 12:32:54 +05:30
Nabin Hait
db48b7d764 [fix] Payment Reconciliation in multi-currency 2015-10-02 12:05:55 +05:30
Rushabh Mehta
83c0899c83 [fix] [minor] default ranges for demo 2015-10-02 11:31:37 +05:30
Anand Doshi
d9ab725be4 [fix] In Payment Tool, Set Payment Amount = Outstanding Amount if checked 2015-10-01 19:17:02 +05:30
Anand Doshi
7afaeb0820 [fix] the case when party account currency is missing 2015-10-01 18:55:43 +05:30
Anand Doshi
ba48f82e03 bumped to version 6.4.2 2015-10-01 14:31:22 +06:00
Anand Doshi
8e7e128e81 Merge pull request #4104 from nabinhait/addresses_and_contacts 
[fix] get permission query condition if no permitted links
 2015-10-01 14:00:38 +05:30
Anand Doshi
0353569e8b Merge pull request #4103 from nabinhait/monthly_attendance_sheet 
[fix] Month issue fixed in Monthly Attendance Sheet
 2015-10-01 13:58:33 +05:30
Anand Doshi
665e2f5418 Merge pull request #4100 from nabinhait/general_ledger_report 
[fix] General Ledger report fixed
 2015-10-01 13:56:13 +05:30
Nabin Hait
dace2b6796 [fix] get permission query condition if no permitted links 2015-10-01 13:54:46 +05:30
Nabin Hait
712b02593a [fix] Month issue fixed in Monthly Attendance Sheet 2015-10-01 12:35:54 +05:30
Nabin Hait
f924e08b93 [fix] Validate duplicate email ids in Lead 2015-10-01 11:51:48 +05:30
Nabin Hait
5c623dae4d [fix] General Ledger report fixed 2015-10-01 11:22:15 +05:30
Anand Doshi
e2c3d40b57 [hotfix] Payment Reconciliation Invoice Type 2015-10-01 11:21:26 +05:30
Anand Doshi
673887455f [fix] Show Contribution (%) in Sales Team table in Customer Form 2015-10-01 11:21:25 +05:30
Anand Doshi
bf7294cf5c bumped to version 6.4.1 2015-09-30 21:20:59 +06:00
Nabin Hait
72d2d682ae Repost GL Entries for Journal Entries where reference name is missing 2015-09-30 18:50:54 +05:30
Anand Doshi
21f6ea6f7e [hotfix] remove allow on submit from item tables 2015-09-30 18:45:29 +05:30
Anand Doshi
f3006972d5 bumped to version 6.4.0 2015-09-30 17:53:52 +06:00
Anand Doshi
dccc6bc11d [change-log] 2015-09-30 17:19:51 +05:30
Anand Doshi
15d2c89939 Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	erpnext/accounts/report/general_ledger/general_ledger.py
 2015-09-30 17:13:58 +05:30
Anand Doshi
ca4c8a2a46 [translations] 2015-09-30 17:10:58 +05:30
Anand Doshi
c320fe541d Merge pull request #4067 from anandpdoshi/remove-party-account-currency 
Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
 2015-09-30 16:55:24 +05:30
Anand Doshi
f40a87511e Merge pull request #4091 from rmehta/repack-allow-low-rate 
[fix] remove validation to disallow lower rate
 2015-09-30 16:46:31 +05:30
Anand Doshi
4945b94950 [fix] added validation to match account currency with existing gle and test case 2015-09-30 16:41:15 +05:30
Rushabh Mehta
cb96b61449 [fix] remove validation to disallow lower rate 2015-09-30 16:22:05 +05:30
Anand Doshi
248c867a2c [minor] removed test case for party multi-currency validation, since party multi-currency is now based on account 2015-09-30 15:11:13 +05:30
Anand Doshi
da98ab6f3c [fix] Only 1 account per company for a party 2015-09-30 15:11:12 +05:30
Anand Doshi
cd0989e051 Added method get_account_currency 2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f [fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account 2015-09-30 15:11:12 +05:30
Nabin Hait
d3cf4f1264 Merge pull request #4075 from anandpdoshi/journal-entry-get-exchange-rate 
return exchange rate as 1 if no account is specified
 2015-09-30 15:05:41 +05:30
Anand Doshi
2dbe2b63b2 Merge pull request #4088 from anandpdoshi/address-contact-permissions 
Apply permissions on address and contact based on permissions of Customer, Supplier
 2015-09-30 12:19:50 +05:30
Anand Doshi
edba8f5582 [fix] Print 'Attach' field in Stock Entry Detail 2015-09-30 11:50:08 +05:30
Anand Doshi
89b8d11f9c [fix] Apply permissions on address and contact based on permissions of Customer, Supplier 2015-09-29 20:11:57 +05:30
Anand Doshi
19a33994da [cleanup] removed desk_home and desk_home_flows from conf.js 2015-09-29 20:06:22 +05:30
Rushabh Mehta
89349d3ae3 [fix] [payment-reconciliation] ignore rows with blank invoice numbers 2015-09-29 16:39:53 +05:30
Rushabh Mehta
4bcbcd29f7 [enhancement] lower priority for newsletter emails 2015-09-29 14:58:45 +05:30
Anand Doshi
740a11263f [minor] validate invoice number is selected in Payment Reconciliation 2015-09-29 12:55:11 +05:30
Anand Doshi
142859f36e Merge pull request #4076 from anandpdoshi/shopping-cart-order 
check doc.has_website_permission in order.html. Merge after frappe/frappe#1316
 2015-09-28 19:40:17 +05:30
Anand Doshi
6534ad082d Merge pull request #4069 from anandpdoshi/round-status-updater-percentages 
Round status update percentages to 2 decimals
 2015-09-28 19:40:01 +05:30
Rushabh Mehta
7f75dbf061 [cleanup] remove backup manager 2015-09-28 19:12:54 +05:30
Anand Doshi
199d8a44fc [fix] check doc.has_website_permission in order.html 2015-09-28 19:04:42 +05:30
Rushabh Mehta
72b1128467 [fixes] accounts controller add flt 2015-09-28 17:29:46 +05:30
Anand Doshi
d6cb55ad1a [fix] return exchange rate as 1 if no account is specified 2015-09-28 17:20:02 +05:30
Anand Doshi
c76e34d7de [fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom 2015-09-28 17:01:44 +05:30
Anand Doshi
33b10faf94 Merge pull request #4074 from anandpdoshi/multi-level-bom-fetch 
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
 2015-09-28 17:00:52 +05:30
Anand Doshi
d970b001a4 [fix] Round status update percentages to 2 decimals 2015-09-28 16:52:22 +05:30
Anand Doshi
d767fb6134 [fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom 2015-09-28 16:44:48 +05:30
gmarke
e5a31462fe Update get_item_details.py 
like this it will be possible to correctly handle cost center for stock entries when no default cost center per company is set
 2015-09-27 09:38:01 +02:00
Anand Doshi
6f39300d43 Merge pull request #4068 from anandpdoshi/due-date-validation 
if no party, don't validate due date based on credit days
 2015-09-25 17:31:33 +05:30
Anand Doshi
0ca587e018 [fix] if no party, don't validate due date based on credit days 2015-09-25 16:32:14 +05:30
Rushabh Mehta
8ffe12ebe4 [chart-of-accounts] added default for Guatemala 2015-09-25 15:40:33 +05:30
Anand Doshi
8579af371c Merge pull request #4057 from rmehta/gl-report-fix 
GL Report Fix
 2015-09-25 12:30:26 +05:30
Rushabh Mehta
b5ff9421e1 [optimize] customer outstanding query 2015-09-25 12:25:12 +05:30
Nabin Hait
44bd3b2601 [fix] Fetch gl entries in receivable/payable report only if party mentioned 2015-09-25 10:33:51 +05:30
Nabin Hait
1b6c00e2c7 [report] Trial Balance for Party 2015-09-25 09:18:03 +05:30
Anand Doshi
f723032fd7 bumped to version 6.3.2 2015-09-24 18:01:11 +06:00
Anand Doshi
3297c43bdf [fix] Tax Rule permission to Account Manager 2015-09-24 17:29:28 +05:30
Anand Doshi
aea250bc5a [fix] [patch] fix missing default lead 2015-09-24 16:31:36 +05:30
Anand Doshi
d37d4dfdec [fix] applicable territory patch and tax rule tests 2015-09-24 15:44:39 +05:30
Anand Doshi
7f96c20f5b bumped to version 6.3.1 2015-09-24 15:53:05 +06:00
Anand Doshi
e75d947867 [fix] [patch] convert applicable territory 2015-09-24 15:22:12 +05:30
Anand Doshi
bba0a5d38f [fix] [patch] tax rule 2015-09-24 15:11:24 +05:30
Anand Doshi
953e97536a [fix] [patch] tax rule 2015-09-24 15:05:06 +05:30
Anand Doshi
e74d7ca33e [fix] [patch] tax rule 2015-09-24 15:04:15 +05:30
Rushabh Mehta
8f2b8afcb7 [fix] gl entry report if not filtered 2015-09-24 15:03:53 +05:30
Anand Doshi
b3f12c3109 [fix] [patch] convert_applicable_territory 2015-09-24 15:01:27 +05:30
Anand Doshi
f66e6aacd4 [fix] [patch] convert_applicable_territory 2015-09-24 14:59:26 +05:30
Anand Doshi
ab57e52cbd bumped to version 6.3.0 2015-09-24 15:05:35 +06:00
Anand Doshi
e63da9813c Merge remote-tracking branch 'frappe/master' into develop 
Conflicts:
	erpnext/patches.txt
 2015-09-24 14:34:50 +05:30
Anand Doshi
c020e42d20 [fix] [patch] convert applicable territory 2015-09-24 13:08:35 +05:30
Anand Doshi
b126ba0132 [change-log] 2015-09-24 13:06:00 +05:30
Anand Doshi
c6e4b5978d [fix] Sales Order - get_query fix 2015-09-24 11:32:54 +05:30
Anand Doshi
361eca4cae Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit 
Sales Team editable after submit
 2015-09-24 11:30:31 +05:30
Anand Doshi
9fc03b6c10 Merge pull request #4052 from rmehta/fix-operation-name 
[fix] minor, remove operation naming field from operation
 2015-09-24 11:30:07 +05:30
Anand Doshi
e2d46d0474 [fix] Allow Sales Team to be added/updated after submit 2015-09-23 19:26:29 +05:30
Rushabh Mehta
dd2f2f5321 [fix] minor, remove operation naming field from operation 2015-09-23 17:06:01 +05:30
Anand Doshi
6e4f5a214a Merge pull request #4033 from rmehta/portal-fixes 
Portal Fixes
 2015-09-23 16:05:12 +05:30
Anand Doshi
b07b0a9e54 [fix] Sales Order indicators for Maintenance 2015-09-23 15:52:11 +05:30
Rushabh Mehta
307978fea9 [test-fixes] 2015-09-23 15:43:09 +05:30
Anand Doshi
06ad308ca1 [fixes] setup wizard and other fixes related to cart 2015-09-23 12:50:35 +05:30
Anand Doshi
52dfc32eca [fix] validate_valuation_rate for Repack 2015-09-23 12:50:35 +05:30
Rushabh Mehta
72fbf902d7 [cleanup] added single price list for shopping cart, removed Applicable Territory 2015-09-23 12:50:34 +05:30
Rushabh Mehta
8ffd483e24 [wip] shopping cart shipping rule, price list cleanup 2015-09-23 12:49:16 +05:30
Rushabh Mehta
3d76686b82 [shopping-cart] cart via Jinja WIP 2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2 [cleanup] [wip] portal, shopping cart cleanup 2015-09-23 12:49:16 +05:30
Anand Doshi
65b6762247 Merge pull request #4049 from bobzz-zone/patch-11 
Update item_grid.html
 2015-09-23 12:09:26 +05:30
Rushabh Mehta
abdfb4d3db [fixed] New button in POS Sales Invoice, reported via forum 2015-09-23 12:05:51 +05:30
bobzz-zone
3bcb13b1b8 Update item_grid.html 
Change the colour of the indicator to be green when delivered qty is bigger than ordered qty
 2015-09-23 11:42:06 +07:00
Anand Doshi
b6ec680c46 [fix] round percentages in get_indicator 2015-09-22 16:36:20 +05:30
Anand Doshi
53a0de7607 [fix] Recalculate rate after applying Pricing Rule 2015-09-22 15:26:53 +05:30
Anand Doshi
0a1d037f01 Merge pull request #3974 from rmehta/dms 
[enhancement] document management system
 2015-09-22 14:51:01 +05:30
Nabin Hait
5b649521d1 [fix] Get outstanding invoices in Payment Reconciliation and Payment Tool 2015-09-22 13:06:34 +05:30
Anand Doshi
798e75832c [fix] Show payment's invoice number as 'Invoice Type | Invoice Number' for better unsability 2015-09-22 12:59:43 +05:30
Nabin Hait
c0c94aef44 [fix] Get outstanding invoices in Payment Reconciliation and Payment Tool 2015-09-22 08:37:37 +05:30
Anand Doshi
e4dfeb651f [optimization] get balance on 2015-09-21 19:31:43 +05:30
Anand Doshi
f7e6eb4fd7 [optimization] get balance on 2015-09-21 19:30:21 +05:30
Rushabh Mehta
97c858a5e3 [fix] pull sales team from customer 2015-09-21 10:03:38 +05:30
Rushabh Mehta
974892bf87 Merge pull request #4036 from rmehta/no-party-currency 
[fix] no default party currency
 2015-09-18 13:40:42 +05:30
Rushabh Mehta
361df8993f [fix] no default party currency 2015-09-18 12:59:51 +05:30
Anand Doshi
b8b8de7a49 [hotfix] multicurrency gl entry 2015-09-17 21:07:45 +05:30
Anand Doshi
be6cfddc4d [hotfix] multicurrency gl entry 2015-09-17 21:07:04 +05:30
Anand Doshi
bf8c8df9ce Revert "[hotfix] set_balance_in_account_currency" 
This reverts commit 9acd6a2629.
 2015-09-17 20:55:50 +05:30
Anand Doshi
40759c284c Revert "[hotfix] set_balance_in_account_currency" 
This reverts commit 9acd6a2629.
 2015-09-17 20:51:41 +05:30
Nabin Hait
a48d754158 [fix] minor issue 2015-09-17 20:37:07 +05:30
Anand Doshi
26bcd89d10 [hotfix] journal entry - get balance 2015-09-17 20:36:44 +05:30
Anand Doshi
20fd360a63 [hotfix] journal entry - get balance 2015-09-17 20:36:19 +05:30
Anand Doshi
df8efce36f [hotfix] set_balance_in_account_currency 2015-09-17 20:29:57 +05:30
Anand Doshi
9acd6a2629 [hotfix] set_balance_in_account_currency 2015-09-17 20:29:31 +05:30
Nabin Hait
a8ef4c9220 [fix] minor issue 2015-09-17 19:38:11 +05:30
Anand Doshi
ce6b61b41e [fix] customer naming series validation and patch to fix missing default taxes and lead 2015-09-17 19:02:59 +05:30
Anand Doshi
0332f83bc2 [fix] customer naming series validation and patch to fix missing default taxes and lead 2015-09-17 19:01:48 +05:30
Nabin Hait
926ae17e5a Update journal_entry.py 2015-09-17 18:42:55 +05:30
Nabin Hait
8adb5f3e32 Update journal_entry.py 2015-09-17 18:40:35 +05:30
Anand Doshi
5532a14938 [hotfix] create customer contact and address from lead only on create 2015-09-17 18:27:56 +05:30
Anand Doshi
a69682c4e0 [hotfix] create customer contact and address from lead only on create 2015-09-17 18:27:36 +05:30
Anand Doshi
d20120e649 [fix] remove duplicate newsletter subscribers 2015-09-17 17:47:26 +05:30
Anand Doshi
e9b14e497b [fix] remove duplicate newsletter subscribers 2015-09-17 17:46:40 +05:30
Anand Doshi
ba0bf9e13d [hotfix] multicurrency patch 2015-09-17 17:36:20 +05:30
Anand Doshi
cba5a684cb [hotfix] multicurrency patch 2015-09-17 17:36:05 +05:30
Anand Doshi
c439b87ccc [hotfix] multicurrency patch 2015-09-17 17:28:58 +05:30
Anand Doshi
340709b2da [hotfix] multicurrency patch 2015-09-17 17:28:39 +05:30
Nabin Hait
a8de61e24b [fix] Multi currency patch 2015-09-17 17:16:58 +05:30
Nabin Hait
9ff52cd57e [fix] Multi currency patch 2015-09-17 17:07:26 +05:30
Rushabh Mehta
e3401182c8 Merge pull request #4012 from saurabh6790/cart 
Taxation for Shopping Cart based on Tax Rule template
 2015-09-17 16:26:35 +05:30
Anand Doshi
0401e418be bumped to version 6.2.0 2015-09-17 16:05:08 +06:00
Anand Doshi
ff6fd7fa9d [change-log] 2015-09-17 15:27:01 +05:30
Anand Doshi
6489e97726 [translations] 2015-09-17 15:08:09 +05:30
Nabin Hait
77ca80217c [fix] Account Currency and Balance fixed in chart of accounts #4019 2015-09-17 14:43:33 +05:30
Nabin Hait
8247ad4028 [fix] Currency symbol fixed in Accounts receivable/payable report #4020 2015-09-17 14:40:15 +05:30
Anand Doshi
1194c6ef4b [fix] use the new split_emails method to split emails by comma 2015-09-17 14:40:15 +05:30
Nabin Hait
87c2d1d634 [fix] Dashboard info in accounting currency for Customer and Supplier #4017 2015-09-17 14:16:01 +05:30
Anand Doshi
2a04d98c16 Merge pull request #4023 from saurabh6790/error_report 
[Fixes] Check Warehouse for Company Delete and Variant Attribute Value
 2015-09-17 13:20:05 +05:30
Anand Doshi
12106725fb [fix] set Payment Amount in Payment Tool 2015-09-17 12:59:44 +05:30
Saurabh
5fe0086d9a [Fixes] Warehouse check while company delete & Variant Attribute value check 2015-09-16 16:59:24 +05:30
Anand Doshi
0b031cdd6c [fix] ignore journal entry based invoice in payment tool and payment reconciliation tool 2015-09-16 12:46:54 +05:30
Anand Doshi
c19afa140d [fix] reload time log in update projects patch 2015-09-16 12:44:22 +05:30
Saurabh
0bd145a608 [fixes] test cases and tax rule validation 2015-09-15 17:06:52 +05:30
Saurabh
c663f5c2bd [Test] test state based taxasion 2015-09-15 15:41:01 +05:30
Saurabh
adde1cff48 [Enhancement] add state ccriteria in tax rule 2015-09-15 15:41:01 +05:30
Saurabh
bb9427d1ef [Fixes] deprecated 2015-09-15 15:41:01 +05:30
Saurabh
052babc6b6 [Fixes] [Minor] removed console statement 2015-09-15 15:41:01 +05:30
Saurabh
24fa06bc53 [Fixes] rebase conflict fixes 2015-09-15 15:41:01 +05:30
Saurabh
7c867ae9ad [Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation 2015-09-15 15:41:01 +05:30
Saurabh
8f7317175d [enhancement] bring taxes from tax rules and test cases 2015-09-15 15:41:01 +05:30
Saurabh
957e7a37be [Shopping Cart][Fixes] tax calculation based on tax rule 2015-09-15 15:41:01 +05:30
Saurabh
def71d4d5d [Shopping Cart][Fixes] tax calculation based on tax rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
ef511b160e Added Tax Rule under ERPNext > Accounts > Setup 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
09f9c96c53 Fixes in Tax Rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
1a2d121073 Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
810bd35609 Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
949d7dbaba Added validations, test-cases to Tax Rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
72e6aa160c Added New Doctype Tax Rule 2015-09-15 15:41:00 +05:30
Anand Doshi
69f2cc8d24 [fix] don't fetch template item in get items of stock reconciliation 2015-09-15 11:54:13 +05:30
Anand Doshi
86102064a5 [fix] Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method 2015-09-15 11:50:30 +05:30
Anand Doshi
0fd3347148 [fix] handle invalid date in get_retirement_date 2015-09-15 11:29:51 +05:30
Anand Doshi
b74265c842 [minor] [patch] reload activity cost in default_activity_rate 2015-09-15 11:27:19 +05:30
Anand Doshi
1fef2fad2d [minor] fixes in queries and payment tool 2015-09-14 18:27:21 +05:30
Anand Doshi
9345240ff1 Merge pull request #4007 from anandpdoshi/setup-wizard-duplicate-entry 
catch DuplicateEntryError in install_fixtures step of Setup Wizard
 2015-09-14 16:33:16 +05:30
Anand Doshi
dbe623b167 [fix] Use User Permission value as default only if the document type is Setup 2015-09-14 13:08:53 +05:30
Anand Doshi
71e51c179c [fix] changed modified for multi-currency sync 2015-09-11 16:55:11 +05:30
Anand Doshi
4b8dbbdf98 [minor] Change modified of Sales Invoice.json 2015-09-11 16:39:03 +05:30
Anand Doshi
979326b0b1 minor fixes in multi-currency 2015-09-11 16:33:45 +05:30
Anand Doshi
5d9cfc76cd Don't copy title field in Duplicate 2015-09-11 15:35:26 +05:30
Nabin Hait
8db7bd2d8f [fix] Igonre permissions while saving Company and Warehouse from Accounts Settings 2015-09-11 15:34:42 +05:30
Rushabh Mehta
d461d462aa [minor] rename notified_modifed > notified_update. Merge with #1296 2015-09-11 15:34:41 +05:30
Anand Doshi
e67fa424b2 [fix] catch DuplicateEntryError in install_fixtures step of Setup Wizard 2015-09-11 15:32:06 +05:30
Anand Doshi
1c2636e7b3 Merge pull request #4003 from nabinhait/fix8 
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
 2015-09-11 15:00:13 +05:30
Anand Doshi
840cad0ff7 Don't copy title field in Duplicate 2015-09-11 12:26:57 +05:30
Nabin Hait
f76d63b92a Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 
[fix][patch] delete item variant attributes if no variants exists against that item
 2015-09-10 19:26:02 +05:30
Nabin Hait
71ef6675ce [fix] Journal Entry client side minor fixes 2015-09-10 19:25:50 +05:30
Anand Doshi
793b87948c [fix] [patch] item template attributes 2015-09-10 18:10:15 +05:30
Nabin Hait
5a803d76ad [fix] Bypass Root Not Editable validation from Setup Wizard 2015-09-10 13:20:35 +05:30
Nabin Hait
9513025130 [fix] Igonre permissions while saving Company and Warehouse from Accounts Settings 2015-09-10 12:13:27 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Nabin Hait
e3ae05aabd Multi-currency: Exchange Rate in Journal Entry 2015-09-09 18:43:12 +05:30
Anand Doshi
a29577ca71 bumped to version 6.1.1 2015-09-09 19:12:48 +06:00
Anand Doshi
b1454cdf9f [fix] fix planned qty 2015-09-09 18:00:09 +05:30
Anand Doshi
c2b4ae6667 bumped to version 6.1.0 2015-09-09 16:02:03 +06:00
Anand Doshi
1857bb8b0b [change-log] 2015-09-09 15:23:16 +05:30
Anand Doshi
888a70c2d4 [fix] Setup Wizard - the case of forgetting mute emails 2015-09-09 15:14:54 +05:30
Anand Doshi
9d5b84e78a Merge pull request #3996 from nabinhait/fix6 
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
 2015-09-09 15:11:12 +05:30
Nabin Hait
f0b3014a23 Planned Qty logic fixed and reposted for existing 2015-09-09 11:04:10 +05:30
Nabin Hait
83dd3e14e5 [fix] Gross Profit report should not include return entries 2015-09-09 10:37:04 +05:30
Nabin Hait
cd103c05d6 Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order 2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408 [minor] Unset Apply User Permissions in default permissions 2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed Fixed conflict 2015-09-08 18:09:03 +05:30
Nabin Hait
83a358afc1 Fix invoice outstanding where party missing 
Conflicts:
	erpnext/accounts/doctype/gl_entry/gl_entry.py
	erpnext/patches.txt
 2015-09-08 16:37:26 +05:30
Nabin Hait
96bb070781 Payment against invoices where party not specified 
Conflicts:
	erpnext/accounts/doctype/gl_entry/gl_entry.py
 2015-09-08 16:36:44 +05:30
Nabin Hait
d387dd3bc6 [fix] Project: round percent_complete to 2 decimals 2015-09-08 16:15:00 +05:30
Anand Doshi
9f25575e0c Merge pull request #3988 from nabinhait/fix2 
Set expense account in stock reco only if company available
 2015-09-08 15:59:18 +05:30
Anand Doshi
e1af7f1a0f [minor] default mins_between_operations = 10 2015-09-08 15:55:09 +05:30
Anand Doshi
2c2868db11 [translations] 2015-09-08 15:53:54 +05:30
Anand Doshi
17f28c13ed [fix] Customer match condition in autosuggest 2015-09-08 15:53:54 +05:30
Anand Doshi
3f1f2dd307 [fix] setup wizard - industry type 2015-09-08 15:53:53 +05:30
Anand Doshi
ab05dcd9f9 [fix] [patch] reload item attribute + value 2015-09-08 15:53:53 +05:30
Rushabh Mehta
f21edba97f [fixes] to task test case and fix tree ui for mobile 2015-09-08 15:53:53 +05:30
Rushabh Mehta
91b0e2348c [minor] task not mandatory for Time Log and Expense Claim #3904 2015-09-08 15:53:53 +05:30
Nabin Hait
4de91887db [patch] Re-run the 'default_title' patch 2015-09-08 15:53:35 +05:30
Anand Doshi
9b1288605f bumped to version 6.0.1 2015-09-08 15:53:05 +05:30
Nabin Hait
2249eea59f Fixed conflict 2015-09-08 12:55:21 +05:30
Nabin Hait
d608363d7b [fix] Map amount in advance payment entry agaionst SO/PO based on party account currency 2015-09-08 12:53:59 +05:30
Nabin Hait
b2739cbb79 Get average exchange rate in case of bank transfer 2015-09-08 12:18:45 +05:30
Anand Doshi
cba99743a4 [fix] Customer match condition in autosuggest 2015-09-07 14:51:30 +05:30
Nabin Hait
f44128f81c Set expense account in stock reco only if company available 2015-09-07 10:45:15 +05:30
Nabin Hait
3607737b5e Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 2015-09-07 10:41:01 +05:30
Nabin Hait
bf9691ed39 Multiple fixes 2015-09-07 10:40:48 +05:30
Anand Doshi
4df98d52c1 [fix] setup wizard - industry type 2015-09-07 10:11:23 +05:30
Anand Doshi
28f8664b93 [fix] [patch] reload item attribute + value 2015-09-04 16:41:27 +05:30
Nabin Hait
216aaaf1d6 Set currency and exchange rate based on Customer's currency while making Quotation from Opportunity 2015-09-04 16:41:04 +05:30
Nabin Hait
3a53d49b7e [fix] Set account and party balance in Journal Entry 2015-09-04 15:46:47 +05:30
Nabin Hait
4d62d7867e [report] Bank Reconciliation Statement in account currency 2015-09-04 13:26:45 +05:30
Nabin Hait
c0e3b1a0c7 Removed account and party balance in company currency from Journal Entry 2015-09-04 13:26:23 +05:30
Nabin Hait
34fe81f7eb Patch fixed 2015-09-03 19:18:00 +05:30
Nabin Hait
11a746d363 Fixed conflict 2015-09-03 16:04:11 +05:30
Nabin Hait
1609933748 Test cases for multi currency 2015-09-03 16:03:07 +05:30
Nabin Hait
59c4ae5a46 [patch] Re-run the 'default_title' patch 2015-09-03 10:46:48 +05:30
Rushabh Mehta
85abdc4fad [minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291 2015-09-03 10:29:38 +05:30
Nabin Hait
98096771c2 [multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that 2015-09-03 10:28:08 +05:30
Anand Doshi
be090fa512 bumped to version 6.0.1 2015-09-02 19:28:14 +06:00
Rushabh Mehta
c2283ca304 [hot] [fix] remove test options in Opportunity 2015-09-02 18:56:35 +05:30
Rushabh Mehta
deb38f7a68 [enhancement] document management system 2015-09-02 18:34:24 +05:30
Anand Doshi
283850ce47 Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes 
Attributes in the variant should be in the same order as in the Template
 2015-09-02 16:09:09 +05:30
Anand Doshi
a6130dc918 bumped to version 6.0.0 2015-09-02 16:32:45 +06:00
Anand Doshi
099bbbded0 Attributes in the variant should be in the same order as in the Template 
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
 2015-09-02 15:56:55 +05:30
Anand Doshi
c3796d273c [change-log] 2015-09-02 15:54:53 +05:30
Anand Doshi
28700d6404 Merge pull request #3973 from nabinhait/fix14 
[Fix] Delete Company Transactions
 2015-09-02 14:59:44 +05:30
Anand Doshi
38f400ea87 Merge pull request #3972 from nabinhait/fix 
Item Price Fix
 2015-09-02 14:57:26 +05:30
Anand Doshi
f5793fff3c Merge pull request #3966 from rmehta/calendar-for-sales-order 
[enhancement] calendar for sales order and other related fixes  #3542
 2015-09-02 14:52:21 +05:30
Nabin Hait
e1d2bef389 [fix] Dont delete Employee while deleting company transactions 2015-09-02 14:07:46 +05:30
Nabin Hait
0ca3e3d89e [fix] Clear notification count while deleting company transactions 2015-09-02 13:09:48 +05:30
Nabin Hait
a1fa659475 [fix] Delete Time Logs while deleting company transactions 2015-09-02 12:56:29 +05:30
Nabin Hait
906bf64f04 [fix] Insert Item Price automatically based on Rate in Stock UOM 2015-09-02 11:32:14 +05:30
Nabin Hait
e52ee553c0 Removed debug flag 2015-09-02 11:32:14 +05:30
Rushabh Mehta
19e560e73f [fix] dropbox backup check not working 2015-09-01 09:57:25 +05:30
Nabin Hait
bac9b8eef6 Payment Tool changes due to multi currency 2015-08-31 19:01:11 +05:30
Nabin Hait
76bb927337 Fixed conflict 2015-08-31 17:28:05 +05:30
Nabin Hait
699751c531 [report] Accounts Receivable / Payable in multi currency 2015-08-31 17:02:04 +05:30
Nabin Hait
06b15bfd63 [report] General Ledger in multi currency 2015-08-31 15:39:03 +05:30
Rushabh Mehta
8f1391dc96 [enhancement] calendar for sales order and other related fixes #3542 2015-08-31 12:42:45 +05:30
Nabin Hait
1901ca5a45 [fix] Fixed gross profit report due to removal of designation field from Sales Team table 2015-08-31 12:02:50 +05:30
Nabin Hait
c68f68d6cc [fix] Patch fixed for account_currency field rename 2015-08-28 19:26:28 +05:30
Nabin Hait
6e439a5e53 Multi currency: test case and fixes 2015-08-28 19:24:22 +05:30
Anand Doshi
3d9d2d1dd1 Exported all doctypes 2015-08-27 17:04:39 +05:30
Anand Doshi
3ea7ce84ed [fix] print hide additional discount, reload doctypes in sales return patch 2015-08-27 17:04:39 +05:30
Anand Doshi
002049eb85 [minor] show Inventory section for new Item if Maintain Stock is checked 2015-08-27 17:04:06 +05:30
Anand Doshi
57a51351d3 [fix] Changed more section label to 'More Information' 2015-08-27 17:04:06 +05:30
Anand Doshi
77a2107973 [minor] In Sales Order, changed label from PO No. to Customer's Purchase Order 2015-08-27 17:04:05 +05:30
Rushabh Mehta
c5346c99de [enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699 2015-08-27 17:03:37 +05:30
Nabin Hait
78be566428 minor fix 2015-08-27 16:27:44 +05:30
Nabin Hait
f6f38f2f2d [new fields] Exchange Rate in Journal Entry and some properties changes in Journal Entry Account 2015-08-27 16:27:33 +05:30
Nabin Hait
9a9a4293b3 [new fields] Party Account Currency, Paid Amount and Write Off Amount in Acompany Currency 2015-08-27 16:26:38 +05:30
Nabin Hait
09c68c9ad0 Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 2015-08-27 14:55:55 +05:30
Nabin Hait
13d8835b75 Fixed merge conflict 2015-08-27 14:55:34 +05:30
Anand Doshi
b8610e1079 [fix] removed update_stock_ledger from delivery note 2015-08-27 14:46:47 +05:30
Anand Doshi
41e948b00a [hotfix] update reserved quantity in delivery note 2015-08-27 14:42:25 +05:30
Nabin Hait
2091f0c97e Checked out json files from upstream 2015-08-27 14:35:17 +05:30
Anand Doshi
c6802ca6d0 [minor] show Inventory section for new Item if Maintain Stock is checked 2015-08-27 13:21:43 +05:30
Anand Doshi
282e4947fa [fix] Changed more section label to 'More Information' 2015-08-27 13:11:46 +05:30
Nabin Hait
54fe26dcfb [patch] Multi currency 2015-08-27 12:55:24 +05:30
Nabin Hait
4ffd7f3d05 Outstanding, paid and write-off amount in Invoice 2015-08-27 12:28:36 +05:30
Nabin Hait
a12d959729 GL Entries for Sales/Purchase Invoice in multi currency 2015-08-27 12:27:24 +05:30
Anand Doshi
b99c180466 Merge branch 'rmehta-validation-settings' into develop 2015-08-27 12:22:06 +05:30
Anand Doshi
6cf193d432 [minor] In Sales Order, changed label from PO No. to Customer's Purchase Order 2015-08-27 12:21:17 +05:30
Nabin Hait
35a5c87cbf [fix] Clear notifications for Sales / Purchase Order on stop/unstop 2015-08-27 12:06:11 +05:30
Rushabh Mehta
740db53b86 [fix] returned_qty reapply and change-log 2015-08-27 12:00:16 +05:30
Anand Doshi
69b6195d3b Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
 2015-08-27 11:39:20 +05:30
Rushabh Mehta
cd2d8a0410 [merge] re-applied changes to sales invoice & delivery note 2015-08-27 11:05:26 +05:30
Rushabh Mehta
5bec301929 Merge branch 'layout-cleanup' into develop 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	erpnext/stock/doctype/delivery_note/delivery_note.json
 2015-08-27 11:01:39 +05:30
Rushabh Mehta
491df14426 [minor] catch invalid item code in pricing list (via support ticket) 2015-08-27 10:31:28 +05:30
Rushabh Mehta
00eba4d7f6 [minor] show price list in sales order (via support ticket) 2015-08-27 10:25:07 +05:30
Rushabh Mehta
17679c6902 [layout cleanup] purchase, stock, journal entry 2015-08-26 22:20:38 +05:30
Anand Doshi
fa65c7bf29 [minor] stopped or cancelled message 2015-08-26 19:15:24 +05:30
Rushabh Mehta
f7800c053b [layout cleanup] in Quotation, Sales Order, Delivery Note 2015-08-26 18:53:37 +05:30
Anand Doshi
eed8906a1e bumped to version 5.8.2 2015-08-26 18:27:24 +06:00
Anand Doshi
414248b792 [fix] event creation on Contact Date 2015-08-26 17:56:55 +05:30
Anand Doshi
28d53be50c bumped to version 5.8.1 2015-08-26 18:13:26 +06:00
Anand Doshi
cb2f9a863d [hotfix] reload Sales and Purchase Order Item 2015-08-26 17:42:40 +05:30
Anand Doshi
2b6bdc1edb [fix] filter and validation of Debit To and Credit To accounts 2015-08-26 17:42:40 +05:30
Anand Doshi
8ca72d8883 bumped to version 5.8.0 2015-08-26 17:25:08 +06:00
Anand Doshi
ab9f03d557 Merge pull request #3952 from neilLasrado/variant-duplication 
Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes
 2015-08-26 16:52:25 +05:30
Anand Doshi
7fa8fb984e [fix] Show write off account 2015-08-26 16:48:41 +05:30
Anand Doshi
f29628072f [change-log] 2015-08-26 14:50:05 +05:30
Anand Doshi
cb3a4caa44 [fix] removed validate due date in Journal Entry 2015-08-26 14:50:04 +05:30
Neil Trini Lasrado
755f1f6841 Fixed validation to prevent duplication of Item Variants in case of Numeric Attributes 2015-08-26 12:59:29 +05:30
Anand Doshi
80a784fdc5 Merge pull request #3943 from nabinhait/fix4 
[fix] Print Delivery Note without amount
 2015-08-26 12:29:24 +05:30
Rushabh Mehta
678a4e24ff [cleanup] Opportunity 2015-08-26 12:27:25 +05:30
Rushabh Mehta
b8a6f40370 [cleanup] layouts of item, customer, supplier, lead 2015-08-26 10:51:45 +05:30
Rushabh Mehta
f24f6044bd [layout] cleaned up Sales Invoice 2015-08-26 10:51:44 +05:30
Rushabh Mehta
b6398be232 [minor] [fix] project query 2015-08-26 10:51:04 +05:30
Anand Doshi
fe13bfed44 Fixes to Return Improvements pull request 
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
 2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8 [enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699 2015-08-25 14:26:42 +05:30
Nabin Hait
b719c469c8 Allow different rate in Return Entry 2015-08-25 14:11:13 +05:30
Nabin Hait
3f321ebfde utilities/repost_stock file renamed to stock/stock_balance 2015-08-25 14:11:13 +05:30
Nabin Hait
047ecd1eb9 Update order reference in return entries and repost reserved / ordered qty 2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8 Update delivered / ordered qty in sales/purchase order from return entry 
Reserved Qty logic cleaned up
 2015-08-25 14:11:12 +05:30
Rushabh Mehta
ddd79f43d2 [fix] [hot] erpnext contact page 2015-08-25 14:03:43 +05:30
Nabin Hait
a7c013c030 [fix] Print Delivery Note without amount 2015-08-24 18:43:19 +05:30
Anand Doshi
f7cfaf58b5 Merge pull request #3927 from neilLasrado/default-warehouse 
Fetch default  WIP Warehouse and FG Warehouse on load of Production Order
 2015-08-24 18:17:30 +05:30
Anand Doshi
82366e4b3f Merge pull request #3941 from nabinhait/fix2 
[fix] Stock Entry additional costs patch fix for v4 accounts
 2015-08-24 17:49:47 +05:30
Anand Doshi
b0d4162ca6 Merge pull request #3942 from nabinhait/fix3 
[fix] In general ledger report, consider cost center in group by voucher
 2015-08-24 17:42:51 +05:30
Anand Doshi
b968772e97 Merge pull request #3939 from neilLasrado/variant 
Fixes in Item Variants
 2015-08-24 17:42:23 +05:30
Nabin Hait
3a990d946d [fix] In general ledger report, consider cost center in group by voucher 2015-08-24 17:21:01 +05:30
Neil Trini Lasrado
db189d7f19 Fixed test case for Item Variants 2015-08-24 16:59:24 +05:30
Nabin Hait
b69eb84936 [fix] Stock Entry additional costs patch fix for v4 accounts 2015-08-24 16:55:10 +05:30
Anand Doshi
5c9bd5e650 bumped to version 5.7.7 2015-08-24 17:23:51 +06:00
Neil Trini Lasrado
92a3dbb5d3 Fixes in Default Warehouse 2015-08-24 15:52:56 +05:30
Neil Trini Lasrado
75d90b1c00 Fixed Produciton Planning Tool 2015-08-24 15:23:58 +05:30
Neil Trini Lasrado
72e4cdcb25 Added default WIP Warehouse and FG Warehouse to Manufacturing Settings 
Fetch default  WIP Warehouse and FG Warehouse on load of Production Order
 2015-08-24 15:23:58 +05:30
Neil Trini Lasrado
4c614bd59a Fixed validation for numeric variants to check with values from template instead of master 2015-08-24 15:13:01 +05:30
Neil Trini Lasrado
7a6f048928 Fixed issue while creating item variants with decimal values (precision error) 2015-08-24 15:13:01 +05:30
Anand Doshi
96773bdc0e Merge pull request #3926 from neilLasrado/prod-order 
Production Order - Validation Added
 2015-08-24 14:44:44 +05:30
Anand Doshi
d092fd918a Merge pull request #3937 from rmehta/purchase-order-fix 
[hot] make_stock_entry button in purchase order
 2015-08-24 14:41:40 +05:30
Anand Doshi
50e2e1d9af Merge pull request #3936 from rmehta/customer-report-fix 
[fix] Customer Address and Contact report
 2015-08-24 14:35:42 +05:30
Rushabh Mehta
da24698cf7 [minor] in ap, ar renamed label for date as 'as on date' as it was confusing 2015-08-24 14:31:07 +05:30
Rushabh Mehta
d999dd1bb9 [minor] fix setup wizard buying_items query 2015-08-24 14:23:55 +05:30
Rushabh Mehta
c8a5a2cc4a [hot] make_stock_entry button in purchase order 2015-08-24 13:12:45 +05:30
Rushabh Mehta
12fb0d998f [fix] Customer Address and Contact report 2015-08-24 12:21:04 +05:30
Neil Trini Lasrado
17231e39cc Added validation in Production Order. Operations Time made mandatory 2015-08-21 16:52:04 +05:30
Anand Doshi
d7a6c11a92 bumped to version 5.7.6 2015-08-21 15:27:19 +06:00
Anand Doshi
bcb386fb64 Merge pull request #3922 from nabinhait/fraction_gle 
Divisonal loss adjustment in purchase receipt
 2015-08-21 14:55:44 +05:30
Nabin Hait
7c2901fb56 [fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation 2015-08-21 14:45:59 +05:30
Nabin Hait
895029dc15 Validate currency in transactions 2015-08-21 14:31:47 +05:30
Nabin Hait
c561a499d7 Multi currency GL entry fixes 2015-08-21 14:31:47 +05:30
Nabin Hait
69c1401764 Multi currency patch initialized 2015-08-21 14:31:47 +05:30
Nabin Hait
50ba6faaf6 Currency input from Chart of Accounts page 2015-08-21 14:31:47 +05:30
Nabin Hait
46bcbaf97b GL Entry in account currency 2015-08-21 14:31:47 +05:30
Nabin Hait
0e46a9b86e Journal Entry: client side triggers 2015-08-21 14:31:46 +05:30
Nabin Hait
e459cb4d09 Journal Entry: validate and post gle in multi currency 2015-08-21 14:31:46 +05:30
Nabin Hait
7dbd395781 Toggle alternative currency fields 2015-08-21 14:31:46 +05:30
Nabin Hait
6aea1c0da5 Currency validation in gl entry 2015-08-21 14:31:46 +05:30
Rushabh Mehta
aeab6c559c [enhancement] multi-currency, added fields #1002 2015-08-21 14:31:46 +05:30
Nabin Hait
597a402dff Divisonal loss adjustment in purchase receipt 2015-08-21 14:13:55 +05:30
Nabin Hait
1b6fd1ba5b [fix]Stock UOM Replace Utility: Multiply Qty after Transaction by conversion factor as well, as there is no qty mentioned for stock reconciliation 2015-08-21 13:05:19 +05:30
Anand Doshi
ac35b8af55 Merge pull request #3912 from nabinhait/jv1 
[fix] payment amt against invoice outstanding
 2015-08-21 13:01:53 +05:30
Anand Doshi
9b02aa722c Merge pull request #3920 from nabinhait/advances 
[fix] Fetch advances in Sales/Purchase Invoice
 2015-08-21 13:01:39 +05:30
Nabin Hait
046db626a2 [fix] Fetch advances in Sales/Purchase Invoice 2015-08-21 12:34:41 +05:30
Nabin Hait
d7ed197131 [fix] UOM Conversion factor mandatory in stock entry 2015-08-21 12:00:32 +05:30
Anand Doshi
e9cebd4de3 bumped to version 5.7.5 2015-08-20 19:17:19 +06:00
Anand Doshi
db1a9edbdf [minor] removed test case of template cannot have stock 2015-08-20 18:20:06 +05:30
Anand Doshi
5c85740aab [minor] don't validate stock for template item 2015-08-20 17:43:35 +05:30
Anand Doshi
8554cbf001 [minor] fixed patch item template attributes 2015-08-20 17:43:35 +05:30
Anand Doshi
30d3eb3d4b bumped to version 5.7.4 2015-08-20 16:15:07 +06:00
Anand Doshi
cf7adb5c02 [patch] re-run repost_reserved_qty 2015-08-20 15:42:58 +05:30
Anand Doshi
ac9a94f421 bumped to version 5.7.3 2015-08-20 16:12:23 +06:00
Anand Doshi
4488764cd0 bumped to version 5.7.2 2015-08-20 16:04:47 +06:00
Nabin Hait
24998a6ca7 [fix][patch] Delete Bin for non-stock item 2015-08-20 15:21:42 +05:30
Nabin Hait
712fccd876 [fix][patch] Repost reserved qty for stock item 2015-08-20 14:59:44 +05:30
Anand Doshi
7299026729 bumped to version 5.7.1 2015-08-20 12:27:31 +06:00
Anand Doshi
98c3aec274 [minor] hide Attribute Value using script so that it is visible in data import 2015-08-20 11:56:31 +05:30
Anand Doshi
807c6af571 [minor] fix item template attributes 2015-08-20 11:42:05 +05:30
Nabin Hait
efc89f4395 [fix] payment amt against invoice outstanding 2015-08-20 11:30:44 +05:30
Anand Doshi
f3eeb601ad Merge pull request #3908 from rmehta/text-editor 
[fix] changed text > text editor for description fields in tables
 2015-08-19 16:48:06 +05:30
Anand Doshi
139283fbf7 bumped to version 5.7.0 2015-08-19 15:04:30 +06:00
Nabin Hait
3922823bd6 [fix] Test case fixed for purchase cost against project 2015-08-19 14:23:13 +05:30
Nabin Hait
6ce72c5b07 [fix] Update project cost for draft project only 2015-08-19 14:15:28 +05:30
Anand Doshi
548f7e8c74 [change-log] for v5.7.0 2015-08-19 13:31:35 +05:30
Anand Doshi
e270c7261d [minor] project cost 2015-08-19 13:02:30 +05:30
Rushabh Mehta
81e9d4e8f5 [fix] changed text > text editor for description fields in tables 2015-08-19 13:00:03 +05:30
Anand Doshi
4765d75b83 [minor] fix typo 2015-08-19 12:50:44 +05:30
Anand Doshi
8af567a229 [minor] import error 2015-08-19 12:10:03 +05:30
Nabin Hait
fa5fcf5405 [fix] Purchase cost against project 2015-08-19 11:56:23 +05:30
Anand Doshi
ffca81dbc1 [fix] added test cases and fixes to Item Variants 2015-08-19 11:52:05 +05:30
Rushabh Mehta
b52724f5b9 [minor] should fix #3884 2015-08-19 11:41:41 +05:30
Nabin Hait
1826791891 [fix][patch] Reserved Qty logic fixed and reposted for existing items 2015-08-19 11:00:00 +05:30
Anand Doshi
df469c3e02 Merge pull request #3901 from rmehta/notify 
[minor] notify stop/unstop (merge after merging realtime in frappe)
 2015-08-19 10:31:41 +05:30
Anand Doshi
90fd6fee23 [fix] generate item code for variant 2015-08-19 10:21:24 +05:30
Anand Doshi
2538e51887 Fixes to Item Variant Attribute. Fixes #3905 2015-08-19 09:33:07 +05:30
Anand Doshi
1d2bde3b56 Merge pull request #3900 from nabinhait/fix6 
Note files deleted, shifted to frappe repo
 2015-08-18 18:35:17 +05:30
Anand Doshi
cf2c624c03 Merge pull request #3902 from rmehta/pos-print 
[enhancement] POS print after save #3853
 2015-08-18 18:32:04 +05:30
Rushabh Mehta
ad9156a6ae [enhancement] POS print after save #385:wq:wq 2015-08-18 18:05:43 +05:30
Anand Doshi
2f01f96ae3 [fix] [patch] item template attributes 2015-08-18 17:52:50 +05:30
Anand Doshi
afbe39a559 [fix] patch and rename Variant Attribute to Item Variant Attribute 2015-08-18 17:30:44 +05:30
Rushabh Mehta
1d1f1b06d9 [minor] notify stop/unstop 2015-08-18 17:26:50 +05:30
Anand Doshi
b6c5b21dd0 [fix] [patch] typo and remove Bulk SMS 2015-08-18 16:27:20 +05:30
Anand Doshi
71c33823f6 Merge pull request #3806 from neilLasrado/item-variants 
Improvements in Item Variants
 2015-08-18 16:13:10 +05:30
Anand Doshi
82988be79f Merge pull request #3846 from rmehta/add-to-learn 
Learn module
 2015-08-18 12:10:03 +05:30
Nabin Hait
5b19dc3a5f Note files deleted, shifted to frappe repo 2015-08-18 11:46:53 +05:30
Anand Doshi
09ba897297 [fix] [patch] Item Template Attributes - migration from v4 and v5 2015-08-17 19:21:29 +05:30
Anand Doshi
ddcc766a55 bumped to version 5.6.4 2015-08-17 17:58:53 +05:30
Nabin Hait
9495adc9d7 Update patches.txt 2015-08-17 17:58:53 +05:30
Nabin Hait
26bc1a58af [fix] Get Balance only if account or party mentioned 2015-08-17 17:58:53 +05:30
Nabin Hait
91e1077e4c [fix] precision issue in stock entry 2015-08-17 17:58:52 +05:30
Nabin Hait
3278ea177d [fix] Additional Costs patch fixed for version 4 to 5 migration 2015-08-17 17:58:52 +05:30
Nabin Hait
f1b2032466 Included Party and reference name in Journal Entry Account grid view 2015-08-17 17:58:52 +05:30
Nabin Hait
1c98886c85 [fix] Get stock and rate function restored 2015-08-17 17:58:52 +05:30
Anand Doshi
92d8a9b2d5 bumped to version 5.6.3 2015-08-17 17:58:52 +05:30
Anand Doshi
fd67ebf66d Show Communication in CRM 2015-08-17 17:58:51 +05:30
Anand Doshi
720ccabfe9 [fix] Journal Entry Reference Name query 2015-08-17 17:58:51 +05:30
Anand Doshi
d4cb1045ed [fix] Show 'Backflush Raw Materials Based On' in Manufacturing Settings 2015-08-17 17:58:51 +05:30
Anand Doshi
4f3eadc488 bumped to version 5.6.2 2015-08-17 17:58:51 +05:30
Anand Doshi
5dc7ff1355 [hotfix] [patch] cleanup journal entry 2015-08-17 17:58:51 +05:30
Anand Doshi
bfbf768daa [hotfix] [patch] cleanup journal entry 2015-08-17 17:58:51 +05:30
Anand Doshi
b334065977 [hotfix] translation in es.csv 2015-08-17 17:58:50 +05:30
Anand Doshi
d74d121199 [hotfix] [report] payment period based on invoice date 2015-08-17 17:58:50 +05:30
Anand Doshi
5e35590bc9 Merge pull request #3871 from anandpdoshi/append-to-communication 
Show Communication in CRM
 2015-08-17 14:48:08 +05:30
Anand Doshi
b23049a55e bumped to version 5.6.4 2015-08-17 15:06:48 +06:00
Nabin Hait
99bf6c0927 Update patches.txt 2015-08-17 14:31:29 +05:30
Nabin Hait
dc76823a81 [fix] Get Balance only if account or party mentioned 2015-08-17 14:28:19 +05:30
Anand Doshi
862c36832a Merge pull request #3892 from nabinhait/fix1 
[fix] Get stock and rate function restored
 2015-08-17 14:26:01 +05:30
Anand Doshi
bd9dad96ae Merge pull request #3894 from nabinhait/fix3 
Included Party and reference name in Journal Entry Account grid view
 2015-08-17 14:24:52 +05:30
Anand Doshi
8ca933a83f Merge pull request #3895 from nabinhait/fix4 
[fix] Additional Costs patch fixed for version 4 to 5 migration
 2015-08-17 14:24:30 +05:30
Nabin Hait
c01342190c [fix] precision issue in stock entry 2015-08-17 14:18:44 +05:30
Nabin Hait
f763c1af25 [fix] Additional Costs patch fixed for version 4 to 5 migration 2015-08-17 12:06:53 +05:30
Nabin Hait
cbfd387c0b Included Party and reference name in Journal Entry Account grid view 2015-08-17 11:42:48 +05:30
Nabin Hait
ac07b1cc07 [fix] Get stock and rate function restored 2015-08-17 10:50:30 +05:30
Anand Doshi
c5a43e46d8 bumped to version 5.6.3 2015-08-14 18:23:40 +06:00
Anand Doshi
1a2e6bf718 Show Communication in CRM 2015-08-14 17:51:14 +05:30
Anand Doshi
04dfd7b98f [fix] Journal Entry Reference Name query 2015-08-14 17:34:43 +05:30
Anand Doshi
85e0e87f01 [fix] Show 'Backflush Raw Materials Based On' in Manufacturing Settings 2015-08-14 12:55:27 +05:30
Anand Doshi
acc32fe7f7 bumped to version 5.6.2 2015-08-14 12:51:37 +06:00
Anand Doshi
487454e817 [hotfix] [patch] cleanup journal entry 2015-08-14 12:17:34 +05:30
Anand Doshi
dc278a7427 [hotfix] [patch] cleanup journal entry 2015-08-14 12:05:50 +05:30
Anand Doshi
698ee434c0 [hotfix] translation in es.csv 2015-08-14 11:45:43 +05:30
Neil Trini Lasrado
68f66a7e8b fixed Test Cases 2015-08-13 17:34:25 +05:30
Anand Doshi
e116cb596c [hotfix] [report] payment period based on invoice date 2015-08-13 17:25:20 +05:30
Neil Trini Lasrado
6cce304b27 Changelog added 2015-08-13 16:19:55 +05:30
Neil Trini Lasrado
9710eede00 Fixed Test Cases 2015-08-13 16:19:55 +05:30
Neil Trini Lasrado
62dba50e9b Multiple Fixes 2015-08-13 16:18:55 +05:30
Neil Trini Lasrado
cdc060cb7c Allow Editing variant attribute in Variant. Add validation to check duplication. 2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
b9b49632f2 Added patch to fetch Item Template Attributes 2015-08-13 16:17:36 +05:30
Neil Trini Lasrado
ebf4cbeae3 Fixed Manage Variant 2015-08-13 16:17:01 +05:30
Neil Trini Lasrado
8b608c9043 Search Variants added to Item Master 
Added feature for Variants to hande numeric values
 2015-08-13 16:17:01 +05:30
Anand Doshi
d7ba618b92 bumped to version 5.6.1 2015-08-13 16:24:41 +06:00
Anand Doshi
0a37f5575f [hotfix] [patch] stock entry additional cost for docstatus < 2 2015-08-13 15:53:40 +05:30
Anand Doshi
bcfd4277f4 bumped to version 5.6.0 2015-08-13 16:14:03 +06:00
Anand Doshi
2b6915519f [change-log] 2015-08-13 15:36:18 +05:30
Anand Doshi
5eb84352ec Merge pull request #3868 from nabinhait/price_list_rate 
[fix] Reset price list rate based on Pricing Rule type
 2015-08-13 15:10:08 +05:30
Anand Doshi
1580bf9ca4 Merge pull request #3869 from rmehta/pricing-rule-layout 
[minor] pricing rule layout
 2015-08-13 15:08:54 +05:30
Rushabh Mehta
4c4c534dcd [minor] pricing rule layout 2015-08-13 15:00:54 +05:30
Nabin Hait
0da11f1b10 [fix] Reset price list rate based on Pricing Rule type 2015-08-13 14:58:19 +05:30
Anand Doshi
cb4784c940 Merge pull request #3822 from neilLasrado/item-uom 
Changed UOM validation for Item Master
 2015-08-13 14:36:37 +05:30
Nabin Hait
58aea1f819 minor fix 2015-08-13 14:15:27 +05:30
Nabin Hait
760bfb27d0 Merge branch 'patch-7' of https://github.com/bobzz-zone/erpnext into bobzz-zone-patch-7 2015-08-13 14:14:26 +05:30
Anand Doshi
c0c4e866be Merge branch 'nabinhait-item_description' into develop 
Conflicts:
	erpnext/patches.txt
 2015-08-13 13:40:33 +05:30
Anand Doshi
b16474e606 [minor] Reload Journal Entry Account 2015-08-13 13:38:22 +05:30
Rushabh Mehta
bbed8972c3 [minor] pincode label changed to postal code, #3770 2015-08-13 13:38:21 +05:30
Rushabh Mehta
35f94dfbc6 [patch] cleanup_journal_entry 2015-08-13 13:38:21 +05:30
Rushabh Mehta
832fa2e76b [patch] cleanup_journal_entry 2015-08-13 13:38:21 +05:30
Rushabh Mehta
682ce24f8c [patch] cleanup_journal_entry 2015-08-13 13:38:21 +05:30
Nabin Hait
9f02b08427 minor fix 2015-08-13 13:38:20 +05:30
Rushabh Mehta
2645980f62 [patch] cleanup_journal_entry 2015-08-13 13:38:20 +05:30
Anand Doshi
ae1a91835e Merge pull request #3866 from nabinhait/fix3 
[fix] fraction issue in gl entry
 2015-08-13 13:35:57 +05:30
Anand Doshi
094755415a Merge pull request #3867 from rmehta/salary-slip-fix 
[fix] salary slip to consider disable rounded total, #3792
 2015-08-13 13:35:02 +05:30
Anand Doshi
746eae4d1a [minor] Reload Journal Entry Account 2015-08-13 12:52:13 +05:30
Rushabh Mehta
cdbb448f6c [fix] salary slip to consider disable rounded total, #3792 2015-08-13 12:48:04 +05:30
Rushabh Mehta
907ea7dd8a [minor] pincode label changed to postal code, #3770 2015-08-13 12:35:43 +05:30
Neil Trini Lasrado
9a73b7a319 Changed UOM validation for Item Master 2015-08-13 12:21:32 +05:30
Nabin Hait
2e54da2ea5 [fix] fraction issue in gl entry 2015-08-13 12:19:27 +05:30
Rushabh Mehta
7e4b93f48e [patch] cleanup_journal_entry 2015-08-13 12:10:21 +05:30
Rushabh Mehta
b01cc1b449 [patch] cleanup_journal_entry 2015-08-13 11:54:04 +05:30
Rushabh Mehta
f738b951c5 [patch] cleanup_journal_entry 2015-08-13 11:50:51 +05:30
Nabin Hait
6ddcac7cee minor fix 2015-08-13 11:47:35 +05:30
Rushabh Mehta
bcf7da6b1e [patch] cleanup_journal_entry 2015-08-13 11:46:01 +05:30
Nabin Hait
c51d5ba5df [patch] Update item description in Production Order based on item master 2015-08-13 11:39:45 +05:30
Anand Doshi
57ca765d9e Merge pull request #3848 from rmehta/journal-entry-refactor 
[refactor] added dynamic link in journal entry, #3847, #3814
 2015-08-13 11:39:13 +05:30
Rushabh Mehta
ed40542658 [fix] minor auto-select party type and add has_permission in whitelisted methods 2015-08-13 10:34:49 +05:30
Rushabh Mehta
207b3efed7 [fix] journal entry get_query 2015-08-12 15:18:35 +05:30
Rushabh Mehta
3131c732ff [fix] capacity planning error 2015-08-12 12:29:16 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Nabin Hait
4a91c49e0d discount percentage should not be reset to zero on applying price list 2015-08-11 18:16:10 +05:30
Anand Doshi
7d45929872 Merge pull request #3829 from dottenbr/customer-taxid 
Tax ID added and Customer Details description updated
 2015-08-11 12:33:32 +05:30
Dominik
28eff7fb91 Phone removed from mandatory in Address 2015-08-10 20:22:21 +05:30
Nabin Hait
6dc40e9baf Update accounts_controller.py 2015-08-10 19:18:39 +05:30
Nabin Hait
ac6d11eb3c minor improvements 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
1c6eeb228f Fixes in Stock Entry 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
b44f26d1ba Fixed Max value for update FG Item in Production Order 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
8ea2f45713 Renamed update_fg_goods_based_on in Manufacturing Settings to backflush_raw_materials_based_on 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
dde65752b6 Fixed code to consider partial FG entry 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
845980c010 Added Feature - Update FG based on Material Transfer For Manufacturing 2015-08-10 19:14:43 +05:30
Nabin Hait
52f3bfca73 change log and sponsors page 2015-08-10 14:07:45 +05:30
Nabin Hait
3c3a3ecea8 Additional Costs in Stock Entry 2015-08-10 14:07:45 +05:30
Nabin Hait
246e47e76e [fix] Dashboard in customer / supplier 2015-08-10 14:07:02 +05:30
Nabin Hait
f6aad5ed2d Distribute tax amount between items in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
aa87931172 Show only active BOM in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
fc155c7712 Added tax table in stock entry 2015-08-10 14:07:01 +05:30
Rushabh Mehta
bf4f99adf1 [learn] added modules #3841 2015-08-10 13:21:57 +05:30
Rushabh Mehta
47b5e6272d Merge pull request #3844 from nabinhait/fix12 
[fix] Made expense account non-mandatory in POS Profile
 2015-08-10 13:16:39 +05:30
Nabin Hait
ea925d26a8 [fix] Made expense account non-mandatory in POS Profile 2015-08-10 12:57:05 +05:30
thecarly
56f5156f3c [minor] fixed typo 2015-08-10 12:50:44 +05:30
Rushabh Mehta
ee069d47b5 Merge pull request #3797 from anandpdoshi/fix-missing-item-images 
Rename old filenames for Item
 2015-08-10 11:58:54 +05:30
Rushabh Mehta
6c83b6bddc Merge pull request #3811 from rmehta/opportunity-customer 
[minor] add close button in opportunity and project links in customer
 2015-08-10 11:57:23 +05:30
Rushabh Mehta
815b460ddd Merge pull request #3809 from nabinhait/journal_entry_fix 
[fix] Party / Account Validation message against Invoice
 2015-08-10 11:57:01 +05:30
Rushabh Mehta
5f7166de83 [minor] remove section break in opportunity 2015-08-10 11:30:47 +05:30
Dominik
d1416542a0 Tax ID added and Customer Details description updated 
Tax ID is a relatively generic descriptor for VAT (Value Added Tax) or any other countrie's tax identification system and should be required by most users of an ERP system. Since this removes the necessity to put the VAT into the Customer Description (not the ideal place to begin with) the description was updated and slimmed down.
 2015-08-08 00:05:38 +05:30
Rushabh Mehta
69095e7285 [fix] website search 2015-08-07 15:48:53 +05:30
Rushabh Mehta
d6bdad7adf [fix] [hot] total in time log batch 2015-08-06 15:46:42 +05:30
Rushabh Mehta
48cccca9af [minor] add close button in opportunity and project links in customer 2015-08-06 15:37:01 +05:30
Nabin Hait
7c5124140e [fix] Party / Account Validation message against Invoice 2015-08-06 12:58:53 +05:30
Nabin Hait
37fdc43c88 bumped to version 5.5.1 2015-08-05 19:44:37 +06:00
Nabin Hait
ceb761852e Merge pull request #3807 from nabinhait/hotfix 
[fix] fifo in stock ledger
 2015-08-05 19:13:12 +05:30
Nabin Hait
65d8de36d0 Merge pull request #3804 from nabinhait/fix1 
Fixes
 2015-08-05 19:04:41 +05:30
Nabin Hait
8142cd2865 [fix] fifo in stock ledger 2015-08-05 18:57:37 +05:30
Anand Doshi
ed3a6cf748 [minor] removed print 2015-08-05 18:38:33 +05:30
Nabin Hait
2285eb7649 Merge pull request #3801 from bobzz-zone/patch-8 
Update buying_controller.py
 2015-08-05 16:15:02 +05:30
Nabin Hait
1648605950 [fix] Disabled OHADA system while fetching COA based on country 2015-08-05 15:56:05 +05:30
Nabin Hait
039154faa9 [fix] Asynchronus issue while fetching item description in Production Order 2015-08-05 15:56:05 +05:30
Rushabh Mehta
147acfd502 [fix] [mobile] abs url erpnext icon 2015-08-05 14:49:32 +05:30
bobzz-zone
b4c7bad33d Update buying_controller.py 
dont force change conversion factor
 2015-08-05 11:30:12 +07:00
bobzz-zone
ff04bf6346 Update stock_entry.py 
fixed for null expense account
 2015-08-05 11:28:11 +07:00
Anand Doshi
aa5182bb9e [fix] rename old filenames that start with FileData and fix missing Item images 2015-08-04 23:06:01 +05:30
Anand Doshi
ffa1e1c3bc bumped to version 5.5.0 2015-08-04 16:42:22 +06:00
Anand Doshi
f6616b6cbd [change-log] 2015-08-04 16:02:37 +05:30
Nabin Hait
0e1314c5b5 [fix] serial no validation in return entry 2015-08-04 15:22:48 +05:30
Rushabh Mehta
5bd394278d [fix] test-case, warehouse mandatory for mix type product bundle 2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813 [enhancement] auto insert item price if missing, #3533 2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975 [enhancement] make service type product bundle: 2015-08-04 14:47:45 +05:30
Anand Doshi
1385f20042 Merge pull request #3791 from rmehta/update-translations 
[translations] updated
 2015-08-04 14:45:58 +05:30
Anand Doshi
950250d444 Merge pull request #3793 from nabinhait/serial_no 
Validate serial no in return entry with against document
 2015-08-04 14:45:30 +05:30
Rushabh Mehta
63b98ec113 [translations] updated 2015-08-04 12:43:37 +05:30
Nabin Hait
b7c0c55d61 Validate serial no in return entry with against document 2015-08-04 12:18:12 +05:30
Nabin Hait
232ad777c9 [fix][patch] Remove fifo stack entry if qty after transaction is zero via stock reconciliation 2015-08-04 11:40:38 +05:30