website style fixes
This commit is contained in:
commit
d2cec5bd14
@ -109,7 +109,7 @@ div.comment { color: #444; }
|
||||
}
|
||||
|
||||
.help {
|
||||
margin: 3px 0px;
|
||||
margin-bottom: 3px;
|
||||
color: #888;
|
||||
}
|
||||
|
||||
@ -1777,7 +1777,6 @@ h6 {
|
||||
font-weight: bold;
|
||||
color: #333333;
|
||||
text-rendering: optimizelegibility;
|
||||
margin-bottom: 0.3em;
|
||||
}
|
||||
h1 small,
|
||||
h2 small,
|
||||
@ -1789,37 +1788,37 @@ h6 small {
|
||||
color: #999999;
|
||||
}
|
||||
h1 {
|
||||
font-size: 30px;
|
||||
line-height: 36px;
|
||||
font-size: 280%;
|
||||
line-height: 120%;
|
||||
}
|
||||
h1 small {
|
||||
font-size: 18px;
|
||||
font-size: 150%;
|
||||
}
|
||||
h2 {
|
||||
font-size: 24px;
|
||||
line-height: 36px;
|
||||
font-size: 200%;
|
||||
line-height: 120%;
|
||||
}
|
||||
h2 small {
|
||||
font-size: 18px;
|
||||
font-size: 150%;
|
||||
}
|
||||
h3 {
|
||||
line-height: 27px;
|
||||
font-size: 18px;
|
||||
font-size: 210%;
|
||||
font-size: 150%;
|
||||
}
|
||||
h3 small {
|
||||
font-size: 14px;
|
||||
font-size: 130%;
|
||||
}
|
||||
h4, h5, h6 {
|
||||
line-height: 18px;
|
||||
font-size: 150%;
|
||||
}
|
||||
h4 {
|
||||
font-size: 14px;
|
||||
font-size: 113%;
|
||||
}
|
||||
h4 small {
|
||||
font-size: 12px;
|
||||
font-size: 100%;
|
||||
}
|
||||
h5 {
|
||||
font-size: 12px;
|
||||
font-size: 100%;
|
||||
}
|
||||
h6 {
|
||||
font-size: 11px;
|
||||
@ -3485,7 +3484,7 @@ button.btn.small, input[type="submit"].btn.small {
|
||||
h1, h2, h3, h4, h5 {
|
||||
font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif;
|
||||
font-weight: normal;
|
||||
color: #66ad78;
|
||||
margin-top: 0.2em;
|
||||
}
|
||||
|
||||
body {
|
||||
|
@ -109,7 +109,7 @@ div.comment { color: #444; }
|
||||
}
|
||||
|
||||
.help {
|
||||
margin: 3px 0px;
|
||||
margin-bottom: 3px;
|
||||
color: #888;
|
||||
}
|
||||
|
||||
@ -415,7 +415,6 @@ h6 {
|
||||
font-weight: bold;
|
||||
color: #333333;
|
||||
text-rendering: optimizelegibility;
|
||||
margin-bottom: 0.3em;
|
||||
}
|
||||
h1 small,
|
||||
h2 small,
|
||||
@ -427,37 +426,37 @@ h6 small {
|
||||
color: #999999;
|
||||
}
|
||||
h1 {
|
||||
font-size: 30px;
|
||||
line-height: 36px;
|
||||
font-size: 280%;
|
||||
line-height: 120%;
|
||||
}
|
||||
h1 small {
|
||||
font-size: 18px;
|
||||
font-size: 150%;
|
||||
}
|
||||
h2 {
|
||||
font-size: 24px;
|
||||
line-height: 36px;
|
||||
font-size: 200%;
|
||||
line-height: 120%;
|
||||
}
|
||||
h2 small {
|
||||
font-size: 18px;
|
||||
font-size: 150%;
|
||||
}
|
||||
h3 {
|
||||
line-height: 27px;
|
||||
font-size: 18px;
|
||||
font-size: 210%;
|
||||
font-size: 150%;
|
||||
}
|
||||
h3 small {
|
||||
font-size: 14px;
|
||||
font-size: 130%;
|
||||
}
|
||||
h4, h5, h6 {
|
||||
line-height: 18px;
|
||||
font-size: 150%;
|
||||
}
|
||||
h4 {
|
||||
font-size: 14px;
|
||||
font-size: 113%;
|
||||
}
|
||||
h4 small {
|
||||
font-size: 12px;
|
||||
font-size: 100%;
|
||||
}
|
||||
h5 {
|
||||
font-size: 12px;
|
||||
font-size: 100%;
|
||||
}
|
||||
h6 {
|
||||
font-size: 11px;
|
||||
@ -1800,7 +1799,7 @@ div.stat-bar {
|
||||
h1, h2, h3, h4, h5 {
|
||||
font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif;
|
||||
font-weight: normal;
|
||||
color: #66ad78;
|
||||
margin-top: 0.2em;
|
||||
}
|
||||
|
||||
body {
|
||||
@ -1873,6 +1872,10 @@ body {
|
||||
/*
|
||||
* erpnext/website/css/website.css
|
||||
*/
|
||||
div#body_div, header .container, .content, #opened-page-selector, footer {
|
||||
width: 900px;
|
||||
}
|
||||
|
||||
.layout_wrapper {
|
||||
padding: 27px;
|
||||
}
|
||||
@ -1978,3 +1981,42 @@ footer a:hover {
|
||||
.web-footer-menu ul li:last-child {
|
||||
border-right: 0px solid #777 !important;
|
||||
}
|
||||
|
||||
/* slide view */
|
||||
|
||||
.next-slide {
|
||||
margin: 0px -27px 100px -27px;
|
||||
background: #ffffff; /* Old browsers */
|
||||
background: -moz-linear-gradient(top, #eeeeee 0%, #fff 100%); /* FF3.6+ */
|
||||
background: -webkit-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, #eeeeee 0%, #fff 100%); /* IE10+ */
|
||||
background: linear-gradient(top, #eeeeee 0%, #fff 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#fff',GradientType=0 ); /* IE6-9 */
|
||||
height: 36px;
|
||||
}
|
||||
|
||||
.slide-shadow {
|
||||
background: #eeeeee; /* Old browsers */
|
||||
background: -moz-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* FF3.6+ */
|
||||
background: -webkit-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* IE10+ */
|
||||
background: linear-gradient(top, #bababa 0%,#eeeeee 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bababa', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
|
||||
height: 3px;
|
||||
margin: 100px -27px 0px -27px;
|
||||
border-top: 1px solid #bababa;
|
||||
}
|
||||
|
||||
.two-column {
|
||||
width: 40%;
|
||||
float: left;
|
||||
padding: 5%;
|
||||
}
|
||||
|
||||
.clear {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
/* */
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-04-02 13:38:02',
|
||||
'creation': '2012-04-03 12:49:42',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-04-02 13:38:02',
|
||||
'modified': '2012-04-03 12:49:43',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2010-09-20 12:33:34',
|
||||
'creation': '2010-09-01 15:47:59',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'ashwini@webnotestech.com'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2010-09-20 12:33:34',
|
||||
'creation': '2010-08-08 17:09:35',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2010-09-20 12:33:34',
|
||||
'creation': '2010-08-08 17:09:35',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-04-02 13:38:02',
|
||||
'creation': '2012-04-03 12:49:42',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-04-02 13:05:04',
|
||||
'modified': '2012-04-03 12:49:42',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -57,7 +57,7 @@ cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
|
||||
|
||||
// Convert group to ledger
|
||||
// -----------------------------------------
|
||||
cur_frm.cscript['Convert to Ledger'] = function(doc, cdt, cdn) {
|
||||
cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
|
||||
$c_obj(make_doclist(cdt,cdn),'convert_group_to_ledger','',function(r,rt) {
|
||||
if(r.message == 1) {
|
||||
doc.group_or_ledger = 'Ledger';
|
||||
@ -69,7 +69,7 @@ cur_frm.cscript['Convert to Ledger'] = function(doc, cdt, cdn) {
|
||||
|
||||
// Convert ledger to group
|
||||
// -----------------------------------------
|
||||
cur_frm.cscript['Convert to Group'] = function(doc, cdt, cdn) {
|
||||
cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
|
||||
$c_obj(make_doclist(cdt,cdn),'convert_ledger_to_group','',function(r,rt) {
|
||||
if(r.message == 1) {
|
||||
doc.group_or_ledger = 'Group';
|
||||
|
@ -65,7 +65,7 @@ cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
|
||||
|
||||
// Convert group to ledger
|
||||
// -----------------------------------------
|
||||
cur_frm.cscript['Convert to Ledger'] = function(doc, cdt, cdn) {
|
||||
cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
|
||||
$c_obj(make_doclist(cdt,cdn),'convert_group_to_ledger','',function(r,rt) {
|
||||
if(r.message == 1) {
|
||||
doc.group_or_ledger = 'Ledger';
|
||||
@ -77,7 +77,7 @@ cur_frm.cscript['Convert to Ledger'] = function(doc, cdt, cdn) {
|
||||
|
||||
// Convert ledger to group
|
||||
// -----------------------------------------
|
||||
cur_frm.cscript['Convert to Group'] = function(doc, cdt, cdn) {
|
||||
cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
|
||||
$c_obj(make_doclist(cdt,cdn),'convert_ledger_to_group','',function(r,rt) {
|
||||
if(r.message == 1) {
|
||||
doc.group_or_ledger = 'Group';
|
||||
|
@ -137,7 +137,7 @@ cur_frm.cscript.rate = function(doc,dt,dn) {
|
||||
refresh_field('ded_amount');
|
||||
cur_frm.cscript.update_totals(doc);
|
||||
}
|
||||
cur_frm.cscript['Get Balance'] = function(doc,dt,dn) {
|
||||
cur_frm.cscript.get_balance = function(doc,dt,dn) {
|
||||
cur_frm.cscript.update_totals(doc);
|
||||
$c_obj(make_doclist(dt,dn), 'get_balance', '', function(r, rt){
|
||||
cur_frm.refresh();
|
||||
@ -157,7 +157,7 @@ cur_frm.cscript.validate = function(doc,cdt,cdn) {
|
||||
|
||||
// TDS
|
||||
// --------
|
||||
cur_frm.cscript['Get TDS'] = function(doc, dt, dn) {
|
||||
cur_frm.cscript.get_tds = function(doc, dt, dn) {
|
||||
$c_obj(make_doclist(dt,dn), 'get_tds', '', function(r, rt){
|
||||
cur_frm.refresh();
|
||||
cur_frm.cscript.update_totals(doc);
|
||||
@ -181,7 +181,7 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){
|
||||
}
|
||||
|
||||
/****************** Get Accounting Entry *****************/
|
||||
cur_frm.cscript['View Ledger Entry'] = function(doc,cdt,cdn){
|
||||
cur_frm.cscript.view_ledger_entry = function(doc,cdt,cdn){
|
||||
var callback = function(report){
|
||||
report.set_filter('GL Entry', 'Voucher No',doc.name);
|
||||
report.dt.run();
|
||||
|
@ -15,7 +15,7 @@
|
||||
'colour': u'White:FFF',
|
||||
'doctype': 'DocType',
|
||||
'issingle': 1,
|
||||
'module': u'Analysis',
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'section_style': u'Simple',
|
||||
'server_code_error': u' ',
|
||||
@ -28,4 +28,4 @@
|
||||
'doctype': 'DocType',
|
||||
'name': u'MIS Control'
|
||||
}
|
||||
]
|
||||
]
|
@ -14,6 +14,6 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
cur_frm.cscript['Export Report'] = function(doc, cdt, cdn) {
|
||||
cur_frm.cscript.export_report = function(doc, cdt, cdn) {
|
||||
$c_obj_csv(make_doclist(cdt, cdn), 'get_report_data', '');
|
||||
}
|
||||
|
@ -17,7 +17,7 @@
|
||||
cur_frm.cscript.tname = "Purchase Invoice Item";
|
||||
cur_frm.cscript.fname = "entries";
|
||||
cur_frm.cscript.other_fname = "purchase_tax_details";
|
||||
wn.require('erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.js');
|
||||
wn.require('erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
|
||||
wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
|
||||
|
||||
// On Load
|
||||
@ -66,11 +66,11 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
|
||||
|
||||
// Show / Hide button
|
||||
if(doc.docstatus==1 && doc.outstanding_amount > 0)
|
||||
cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript['Make Bank Voucher']);
|
||||
cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript.make_bank_voucher);
|
||||
|
||||
if(doc.docstatus==1) {
|
||||
unhide_field(['Repair Outstanding Amt']);
|
||||
cur_frm.add_custom_button('View Ledger', cur_frm.cscript['View Ledger Entry']);
|
||||
cur_frm.add_custom_button('View Ledger', cur_frm.cscript.view_ledger_entry);
|
||||
} else hide_field(['Repair Outstanding Amt']);
|
||||
|
||||
cur_frm.cscript.is_opening(doc, dt, dn);
|
||||
@ -162,14 +162,14 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) {
|
||||
|
||||
// Recalculate Button
|
||||
// -------------------
|
||||
cur_frm.cscript['Recalculate'] = function(doc, cdt, cdn) {
|
||||
cur_frm.cscript['Calculate Tax'](doc,cdt,cdn);
|
||||
cur_frm.cscript.recalculate = function(doc, cdt, cdn) {
|
||||
cur_frm.cscript.calculate_tax(doc,cdt,cdn);
|
||||
calc_total_advance(doc,cdt,cdn);
|
||||
}
|
||||
|
||||
// Get Items Button
|
||||
// -----------------
|
||||
cur_frm.cscript['Get Items'] = function(doc, dt, dn) {
|
||||
cur_frm.cscript.get_items = function(doc, dt, dn) {
|
||||
var callback = function(r,rt) {
|
||||
unhide_field(['supplier_address', 'contact_person', 'supplier_name', 'address_display', 'contact_display', 'contact_mobile','contact_email']);
|
||||
refresh_many(['credit_to','supplier','supplier_address','contact_person','supplier_name', 'address_display', 'contact_display','contact_mobile', 'contact_email','entries', 'purchase_receipt_main', 'purchase_order_main', 'purchase_tax_details']);
|
||||
@ -201,7 +201,7 @@ cur_frm.cscript.ded_amount = function(doc,dt,dn) {calculate_outstanding(doc);}
|
||||
|
||||
// Get TDS Button
|
||||
// ---------------
|
||||
cur_frm.cscript['Get TDS'] = function(doc, dt, dn) {
|
||||
cur_frm.cscript.get_tds = function(doc, dt, dn) {
|
||||
var callback = function(r,rt) {
|
||||
cur_frm.refresh();
|
||||
refresh_field('ded_amount');
|
||||
@ -231,7 +231,7 @@ cur_frm.cscript.allocated_amount = function(doc,cdt,cdn){
|
||||
|
||||
// Make Journal Voucher
|
||||
// --------------------
|
||||
cur_frm.cscript['Make Bank Voucher'] = function() {
|
||||
cur_frm.cscript.make_bank_voucher = function() {
|
||||
$c('accounts.get_default_bank_account', { company: cur_frm.doc.company }, function(r, rt) {
|
||||
if(!r.exc) {
|
||||
cur_frm.cscript.make_jv(cur_frm.doc, null, null, r.message);
|
||||
@ -399,7 +399,7 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){
|
||||
}
|
||||
|
||||
/****************** Get Accounting Entry *****************/
|
||||
cur_frm.cscript['View Ledger Entry'] = function(){
|
||||
cur_frm.cscript.view_ledger_entry = function(){
|
||||
var callback = function(report){
|
||||
report.set_filter('GL Entry', 'Voucher No',cur_frm.doc.name);
|
||||
report.dt.run();
|
||||
|
@ -19,7 +19,7 @@
|
||||
'default_print_format': u'Standard',
|
||||
'doctype': 'DocType',
|
||||
'document_type': u'Master',
|
||||
'module': u'Buying',
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'section_style': u'Simple',
|
||||
'server_code_error': u' ',
|
@ -23,7 +23,7 @@ cur_frm.cscript.sales_team_fname = "sales_team";
|
||||
cur_frm.pformat.print_heading = 'Invoice';
|
||||
|
||||
wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
|
||||
wn.require('erpnext/setup/doctype/other_charges/other_charges.js');
|
||||
wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
|
||||
wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
|
||||
wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
|
||||
|
||||
@ -108,15 +108,15 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
|
||||
if (!cur_frm.cscript.is_onload) cur_frm.cscript.hide_price_list_currency(doc, dt, dn);
|
||||
|
||||
if(doc.docstatus==1) {
|
||||
cur_frm.add_custom_button('View Ledger', cur_frm.cscript['View Ledger Entry']);
|
||||
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
|
||||
cur_frm.add_custom_button('View Ledger', cur_frm.cscript.view_ledger_entry);
|
||||
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
|
||||
unhide_field('Repair Outstanding Amt');
|
||||
|
||||
if(doc.is_pos==1 && doc.update_stock!=1)
|
||||
cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']);
|
||||
|
||||
if(doc.outstanding_amount!=0)
|
||||
cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript['Make Bank Voucher']);
|
||||
cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript.make_bank_voucher);
|
||||
}
|
||||
else
|
||||
hide_field('Repair Outstanding Amt');
|
||||
@ -275,7 +275,7 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) {
|
||||
/* **************************** TRIGGERS ********************************** */
|
||||
|
||||
// Get Items based on SO or DN Selected
|
||||
cur_frm.cscript['Get Items'] = function(doc, dt, dn) {
|
||||
cur_frm.cscript.get_items = function(doc, dt, dn) {
|
||||
var callback = function(r,rt) {
|
||||
unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
|
||||
cur_frm.refresh();
|
||||
@ -314,7 +314,7 @@ cur_frm.cscript['Make Delivery Note'] = function() {
|
||||
|
||||
// Make Bank Voucher Button
|
||||
// -------------------------
|
||||
cur_frm.cscript['Make Bank Voucher'] = function(doc, dt, dn) {
|
||||
cur_frm.cscript.make_bank_voucher = function(doc, dt, dn) {
|
||||
$c('accounts.get_default_bank_account', { company: cur_frm.doc.company }, function(r, rt) {
|
||||
if(!r.exc) {
|
||||
cur_frm.cscript.make_jv(cur_frm.doc, null, null, r.message);
|
||||
@ -470,7 +470,7 @@ cur_frm.cscript.make_jv = function(doc, dt, dn, bank_account) {
|
||||
|
||||
|
||||
/****************** Get Accounting Entry *****************/
|
||||
cur_frm.cscript['View Ledger Entry'] = function(){
|
||||
cur_frm.cscript.view_ledger_entry = function(){
|
||||
var callback = function(report){
|
||||
report.set_filter('GL Entry', 'Voucher No',cur_frm.doc.name);
|
||||
report.dt.run();
|
||||
|
@ -19,7 +19,7 @@
|
||||
'default_print_format': u'Standard',
|
||||
'doctype': 'DocType',
|
||||
'document_type': u'Master',
|
||||
'module': u'Setup',
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'section_style': u'Tabbed',
|
||||
'server_code_error': u' ',
|
||||
@ -192,4 +192,4 @@
|
||||
'options': u'Sales Taxes and Charges',
|
||||
'permlevel': 0
|
||||
}
|
||||
]
|
||||
]
|
@ -44,7 +44,7 @@ cur_frm.cscript.from_date = function(doc,cdt,cdn){
|
||||
// Make Journal Voucher
|
||||
// --------------------
|
||||
|
||||
cur_frm.cscript['Make Bank Voucher'] = function(doc, dt, dn) {
|
||||
cur_frm.cscript.make_bank_voucher = function(doc, dt, dn) {
|
||||
var call_back = function(r,rt) {
|
||||
cur_frm.cscript.make_jv(doc,dt,dn,r.message);
|
||||
}
|
||||
|
0
erpnext/accounts/search_criteria/lease_over_due_list/__init__.py → erpnext/accounts/doctype/trend_analyzer_control/__init__.py
Normal file → Executable file
0
erpnext/accounts/search_criteria/lease_over_due_list/__init__.py → erpnext/accounts/doctype/trend_analyzer_control/__init__.py
Normal file → Executable file
@ -16,7 +16,7 @@
|
||||
'doctype': 'DocType',
|
||||
'in_create': 1,
|
||||
'issingle': 1,
|
||||
'module': u'Analysis',
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'read_only': 1,
|
||||
'section_style': u'Simple',
|
||||
@ -29,4 +29,4 @@
|
||||
'doctype': 'DocType',
|
||||
'name': u'Trend Analyzer Control'
|
||||
}
|
||||
]
|
||||
]
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'harshada@webnotestech.com'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:43',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:43',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'saumil@webnotestech.com'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:43',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:43',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -1,36 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
this.add_filter({fieldname:'report', label:'Report Type', fieldtype:'Select', options:NEWLINE + 'CENVAT CREDIT ACCOUNT - INPUTS (R.G.23 A - PART II)' + NEWLINE + 'CAPITAL GOODS - INPUTS (R.G. 23 C - PART II)', ignore : 1, parent:'Journal Voucher Detail'})
|
||||
this.add_filter({fieldname:'main_acc_head', label:'Main Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
this.add_filter({fieldname:'add_acc_head', label:'Additional Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
this.add_filter({fieldname:'cvd_acc_head', label:'CVD Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
this.add_filter({fieldname:'edu_cess_acc_head', label:'Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
this.add_filter({fieldname:'sh_edu_cess_acc_head', label:'S.H.Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
|
||||
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0;
|
||||
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date());
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df['report_default']=sys_defaults.company;
|
||||
|
||||
//this.large_report = 1;
|
||||
}
|
@ -1,154 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Add columns
|
||||
# -----------
|
||||
row_list = [['Date', 'Date', '150px', '']
|
||||
,['ARI/INVOICE/Other Approved document/Bill of entry No.', 'Date', '150px', '']
|
||||
,['Date', 'Date', '150px', '']
|
||||
,['Baisc Excise Duty', 'Currency', '150px', '']
|
||||
,['Additional Duty', 'Currency', '150px', '']
|
||||
,['Education Cess', 'Currency', '150px', '']
|
||||
,['S.H.Education Cess', 'Currency', '150px', '']
|
||||
,[' Basic Excise Duty', 'Currency', '150px', '']
|
||||
,[' Education Cess', 'Currency', '150px', '']
|
||||
,[' S.H.Education Cess', 'Currency', '150px', '']
|
||||
,['Basic Excise Duty ', 'Currency', '150px', '']
|
||||
,['Education Cess ', 'Currency', '150px', '']
|
||||
,['S.H.Education Cess ', 'Currency', '150px', '']
|
||||
,['Remarks', 'Data', '150px', '']
|
||||
]
|
||||
|
||||
if not filter_values['report']:
|
||||
msgprint("Please Select Report Type. ")
|
||||
raise Exception
|
||||
|
||||
if 'CAPITAL' not in filter_values['report']:
|
||||
row_list.insert(3,['Range/ Divsion/ Custom House from where received', 'Data', '150px', ''])
|
||||
row_list.insert(4,['Folio No. & Entry No. in Part I', 'Data', '150px', ''])
|
||||
row_list.insert(7,['CVD', 'Currency', '150px', ''])
|
||||
row_list.insert(10,['ARI/INVOICE/ Other Approved document/Bill of entry No.', 'Data', '100px', ''])
|
||||
row_list.insert(11,['Date', 'Date', '150px', ''])
|
||||
elif 'CAPITAL' in filter_values['report']:
|
||||
row_list.insert(7,[' Basic Excise Duty ', 'Currency', '150px', ''])
|
||||
row_list.insert(8,[' Education Cess ', 'Currency', '150px', ''])
|
||||
row_list.insert(9,[' S.H.Education Cess ', 'Currency', '150px', ''])
|
||||
row_list.insert(10,['ARI/INVOICE/ Other Approved document/Bill of entry No.', 'Data', '100px', ''])
|
||||
row_list.insert(11,['Date', 'Date', '150px', ''])
|
||||
|
||||
for r in row_list:
|
||||
colnames.append(r[0])
|
||||
coltypes.append(r[1])
|
||||
colwidths.append(r[2])
|
||||
coloptions.append(r[3])
|
||||
col_idx[r[0]] = len(colnames)-1
|
||||
|
||||
|
||||
# get as_on_date for opening
|
||||
as_on_date = ''
|
||||
if filter_values.get('posting_date'):
|
||||
as_on_date = add_days(filter_values['posting_date'], -1)
|
||||
|
||||
ysd, from_date_year = sql("select year_start_date, name from `tabFiscal Year` where %s between year_start_date and date_add(year_start_date,interval 1 year)",as_on_date)[0]
|
||||
|
||||
|
||||
# Get Opening Balance
|
||||
def get_opening_balance(acc, fy, as_on_date, ysd, get_opening_balance, get_obj):
|
||||
glc = get_obj('GL Control')
|
||||
acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % acc)
|
||||
return glc.get_as_on_balance(acc, fy, as_on_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
|
||||
|
||||
cum_sum_main_acc_head = cum_sum_add_acc_head = cum_sum_cvd_acc_head = cum_sum_edu_cess_acc_head = cum_sum_sh_edu_cess_acc_head = 0
|
||||
openg_main_acc_head = openg_add_acc_head = openg_cvd_acc_head = openg_edu_cess_acc_head = openg_sh_edu_cess_acc_head = 0
|
||||
|
||||
# Get Opening of Basic Excise Duty
|
||||
if not filter_values['main_acc_head']:
|
||||
msgprint("Please Enter Main Account Head")
|
||||
raise Exception
|
||||
cum_sum_main_acc_head = openg_main_acc_head = get_opening_balance(filter_values['main_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj)
|
||||
|
||||
# Get Opening of add_acc_head
|
||||
if filter_values['add_acc_head'] : cum_sum_add_acc_head = openg_add_acc_head = get_opening_balance(filter_values['add_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj)
|
||||
|
||||
# Get Opening of cvd_acc_head
|
||||
if filter_values['cvd_acc_head'] : cum_sum_cvd_acc_head = openg_cvd_acc_head = get_opening_balance(get_opening_balance, filter_values['cvd_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj)
|
||||
|
||||
# Get Opening of edu_cess_acc_head
|
||||
if not filter_values['edu_cess_acc_head'] :
|
||||
msgprint("Please Enter Edu Cess Account Head")
|
||||
raise Exception
|
||||
cum_sum_edu_cess_acc_head = openg_edu_cess_acc_head = get_opening_balance(filter_values['edu_cess_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj)
|
||||
|
||||
# Get Opening of sh_edu_cess_acc_head
|
||||
if not filter_values['sh_edu_cess_acc_head'] :
|
||||
msgprint("Please Enter S.H.Edu Cess Account Head")
|
||||
raise Exception
|
||||
cum_sum_sh_edu_cess_acc_head = openg_sh_edu_cess_acc_head = get_opening_balance(filter_values['sh_edu_cess_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj)
|
||||
|
||||
|
||||
for r in res:
|
||||
remarks = r[col_idx['ARI/INVOICE/ Other Approved document/Bill of entry No.']]
|
||||
r[col_idx['ARI/INVOICE/ Other Approved document/Bill of entry No.']] = ''
|
||||
r.append('')
|
||||
if 'CAPITAL' not in filter_values['report']:
|
||||
r.append(0.00)
|
||||
r.append(0.00)
|
||||
r.append(0.00)
|
||||
cum_sum_main_acc_head = flt(cum_sum_main_acc_head) + flt(r[col_idx['Baisc Excise Duty']])
|
||||
cum_sum_add_acc_head = flt(cum_sum_add_acc_head) + flt(r[col_idx['Additional Duty']])
|
||||
cum_sum_cvd_acc_head = flt(cum_sum_cvd_acc_head) + flt(r[col_idx['CVD']])
|
||||
|
||||
r.append( cum_sum_main_acc_head + cum_sum_add_acc_head + cum_sum_cvd_acc_head)
|
||||
cum_sum_edu_cess_acc_head = flt(cum_sum_edu_cess_acc_head) + flt(r[col_idx['Education Cess']])
|
||||
r.append(cum_sum_edu_cess_acc_head)
|
||||
cum_sum_sh_edu_cess_acc_head = flt(cum_sum_sh_edu_cess_acc_head) + flt(r[col_idx['S.H.Education Cess']])
|
||||
r.append(cum_sum_sh_edu_cess_acc_head)
|
||||
elif 'CAPITAL' in filter_values['report']:
|
||||
# As there is no range and Folio No
|
||||
r[col_idx['Baisc Excise Duty']] = r[col_idx['Education Cess']]
|
||||
r[col_idx['Additional Duty']] = r[col_idx['S.H.Education Cess']]
|
||||
r[col_idx['Education Cess']] = r[col_idx[' Education Cess ']]
|
||||
r[col_idx['S.H.Education Cess']] = r[col_idx[' S.H.Education Cess ']]
|
||||
|
||||
cum_sum_main_acc_head = flt(cum_sum_main_acc_head) + flt(r[col_idx['Baisc Excise Duty']])
|
||||
cum_sum_add_acc_head = flt(cum_sum_add_acc_head) + flt(r[col_idx['Additional Duty']])
|
||||
|
||||
r[col_idx[' Basic Excise Duty ']]= flt(cum_sum_main_acc_head) + flt(cum_sum_add_acc_head)
|
||||
cum_sum_edu_cess_acc_head = flt(cum_sum_edu_cess_acc_head) + flt(r[col_idx['Education Cess']])
|
||||
r[col_idx[' Education Cess ']]= flt(cum_sum_edu_cess_acc_head)
|
||||
cum_sum_sh_edu_cess_acc_head = flt(cum_sum_sh_edu_cess_acc_head) + flt(r[col_idx['S.H.Education Cess']])
|
||||
r[col_idx[' S.H.Education Cess ']]= flt(cum_sum_sh_edu_cess_acc_head)
|
||||
|
||||
r.append(0.00)
|
||||
r.append(0.00)
|
||||
r.append(0.00)
|
||||
|
||||
r.append( cum_sum_main_acc_head + cum_sum_add_acc_head)
|
||||
r.append(cum_sum_edu_cess_acc_head)
|
||||
r.append(cum_sum_sh_edu_cess_acc_head)
|
||||
r.append(remarks)
|
||||
|
||||
|
||||
out = []
|
||||
|
||||
if 'CAPITAL' not in cstr(filter_values['report']):
|
||||
out.append(['Opening Balance of Duty in Credit', '', '', '', '', '', '', '', '', '', '', '','','','', flt(openg_main_acc_head) + flt(openg_add_acc_head) + flt(openg_cvd_acc_head), flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head),''])
|
||||
elif 'CAPITAL' in filter_values['report']:
|
||||
out.append(['Opening Balance of Duty in Credit', '', '', '', '', '', '', '', '', '', '', '', '', '', '', flt(openg_main_acc_head) + flt(openg_add_acc_head) , flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head)])
|
||||
out += res
|
||||
#if from_export == 0:
|
||||
# msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please click on 'Export' to open in a spreadsheet")
|
||||
# raise Exception
|
@ -1,31 +0,0 @@
|
||||
SELECT t1.posting_date, t1.bill_no, t1.bill_date, t1.range, t1.name, SUM(CASE WHEN t2.account_head like '%(main_acc_head)s%' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(add_acc_head)s%' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(cvd_acc_head)s%' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(edu_cess_acc_head)s' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(sh_edu_cess_acc_head)s' THEN t2.tax_amount ELSE 0.00 END), t1.`remarks`
|
||||
FROM `tabPurchase Receipt` t1, `tabPurchase Tax Detail` t2
|
||||
WHERE t2.parent = t1.name
|
||||
AND t2.parent = 'Purchase Reciept'
|
||||
AND (t2.account_head LIKE '%(main_acc_head)s' and '%(main_acc_head)s%%' or '~~~~'
|
||||
OR t2.account_head LIKE '%(add_acc_head)s' and '%(add_acc_head)s%%' or '~~~~'
|
||||
OR t2.account_head LIKE '%(cvd_acc_head)s' and '%(cvd_acc_head)s%%' or '~~~~'
|
||||
OR t2.account_head LIKE '%(edu_cess_acc_head)s' and '%(edu_cess_acc_head)s%%' or '~~~~'
|
||||
OR t2.account_head LIKE '%(sh_edu_cess_acc_head)s%' and '%(sh_edu_cess_acc_head)s%%' or '~~~~')
|
||||
AND t1.`posting_date` >= '%(posting_date)s'
|
||||
AND t1.`posting_date` <= '%(posting_date1)s'
|
||||
AND t1.docstatus =1
|
||||
GROUP BY t1.`name`
|
||||
|
||||
UNION
|
||||
|
||||
SELECT t1.posting_date, t1.bill_no, t1.bill_date, '' AS 'Range', t1.name, SUM(CASE WHEN t2.account like '%(main_acc_head)s%' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(add_acc_head)s%' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(cvd_acc_head)s%' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(edu_cess_acc_head)s' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(sh_edu_cess_acc_head)s' THEN t2.debit ELSE 0.00 END), t1.`remark`
|
||||
FROM `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2
|
||||
WHERE (t2.debit is not NULL OR t2.debit != '')
|
||||
AND t2.debit > 0
|
||||
AND t2.parent = t1.name
|
||||
AND (t2.account LIKE '%(main_acc_head)s' and '%(main_acc_head)s%%' or '~~~~'
|
||||
OR t2.account LIKE '%(add_acc_head)s' and '%(add_acc_head)s%%' or '~~~~'
|
||||
OR t2.account LIKE '%(cvd_acc_head)s' and '%(cvd_acc_head)s%%' or '~~~~'
|
||||
OR t2.account LIKE '%(edu_cess_acc_head)s' and '%(edu_cess_acc_head)s%%' or '~~~~'
|
||||
OR t2.account LIKE '%(sh_edu_cess_acc_head)s%' and '%(sh_edu_cess_acc_head)s%%' or '~~~~') AND t1.`posting_date` >= '%(posting_date)s'
|
||||
AND t1.`posting_date` <= '%(posting_date1)s'
|
||||
AND t1.docstatus =1
|
||||
GROUP BY t1.`name`
|
||||
|
||||
ORDER BY `posting_date`,`name`
|
@ -1,34 +0,0 @@
|
||||
# Search Criteria, cenvat_credit_-_input_or_capital_goods
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2010-11-01 10:56:14',
|
||||
'docstatus': 0,
|
||||
'modified': '2010-10-29 16:42:14',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'jai@webnotestech.com'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'criteria_name': 'Cenvat Credit - Input or Capital Goods',
|
||||
'dis_filters': 'fiscal_year',
|
||||
'doc_type': 'Journal Voucher Detail',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','Sales Invoice\x01Aging Based On':'','Purchase Invoice\x01Aging Based On':'Transaction Date','Journal Voucher Detail\x01Report Type':'CENVAT CREDIT ACCOUNT - INPUTS (R.G.23 A - PART II)'}",
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'page_len': 50,
|
||||
'parent_doc_type': 'Journal Voucher',
|
||||
'sort_by': 'ID',
|
||||
'sort_order': 'DESC',
|
||||
'standard': 'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, cenvat_credit_-_input_or_capital_goods
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': 'cenvat_credit_-_input_or_capital_goods'
|
||||
}
|
||||
]
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:50',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:50',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'swarnalata@webnotestech.com'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:51',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:51',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'nabin@webnotestech.com'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:31',
|
||||
'creation': '2012-04-03 12:49:51',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:31',
|
||||
'modified': '2012-04-03 12:49:51',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'nabin@webnotestech.com'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:43',
|
||||
'creation': '2012-04-03 12:49:51',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:43',
|
||||
'modified': '2012-04-03 12:49:51',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:43',
|
||||
'creation': '2012-04-03 12:49:51',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:43',
|
||||
'modified': '2012-04-03 12:49:51',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
@ -18,7 +18,7 @@
|
||||
'doc_type': u'Sales Invoice',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': u"{'Sales Invoice\x01Saved':1,'Sales Invoice\x01Submitted':1,'Sales Invoice\x01Is Opening':'','Sales Invoice\x01Fiscal Year':''}",
|
||||
'module': u'Home',
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'page_len': 50,
|
||||
'sort_by': u'`tabSales Invoice`.`name`',
|
||||
@ -31,4 +31,4 @@
|
||||
'doctype': 'Search Criteria',
|
||||
'name': u'invoices-overdue'
|
||||
}
|
||||
]
|
||||
]
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:32',
|
||||
'creation': '2012-04-03 12:49:51',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:32',
|
||||
'modified': '2012-04-03 12:49:51',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:43',
|
||||
'creation': '2012-04-03 12:49:51',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:43',
|
||||
'modified': '2012-04-03 12:49:51',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -1,27 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1});
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=sys_defaults.year_start_date;
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
}
|
||||
|
||||
$dh(this.mytabs.tabs['More Filters']);
|
||||
$dh(this.mytabs.tabs['Select Columns']);
|
@ -1,29 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
data =[
|
||||
['Agreement No.','Data','100px',''],
|
||||
['Lessee Name','Data','300px',''],
|
||||
['Amount','Currency','120px','']
|
||||
]
|
||||
|
||||
for d in data:
|
||||
colnames.append(d[0])
|
||||
coltypes.append(d[1])
|
||||
colwidths.append(d[2])
|
||||
coloptions.append(d[3])
|
||||
col_idx[d[0]] = len(colnames)-1
|
||||
|
@ -1,3 +0,0 @@
|
||||
select la.name, la.account, la.invoice_amount
|
||||
from `tabLease Agreement` la
|
||||
where start_date between '%(date)s' and '%(date1)s' order by la.name
|
@ -1,30 +0,0 @@
|
||||
# Search Criteria, lease_agreement_list
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2011-07-27 16:17:04',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-07-27 16:17:04',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
|
||||
'criteria_name': 'Lease Agreement List',
|
||||
'doc_type': 'GL Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'standard': 'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, lease_agreement_list
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': 'lease_agreement_list'
|
||||
}
|
||||
]
|
@ -1,30 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1});
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
// this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df.filter_hide=1;
|
||||
|
||||
}
|
||||
|
||||
$dh(this.mytabs.tabs['More Filters']);
|
||||
$dh(this.mytabs.tabs['Select Columns']);
|
@ -1,29 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
data =[
|
||||
['Month','Data','100px',''],
|
||||
['Year','Data','100px',''],
|
||||
['Amount','Currency','120px','']
|
||||
]
|
||||
|
||||
for d in data:
|
||||
colnames.append(d[0])
|
||||
coltypes.append(d[1])
|
||||
colwidths.append(d[2])
|
||||
coloptions.append(d[3])
|
||||
col_idx[d[0]] = len(colnames)-1
|
||||
|
@ -1,9 +0,0 @@
|
||||
select date_format(due_date,'%M') as mnt,year(due_date),sum(amount)
|
||||
|
||||
from `tabLease Agreement` la,`tabLease Installment` lai
|
||||
|
||||
where la.name=lai.parent and (lai.cheque_date is null or lai.cheque_date > '%(date)s')
|
||||
|
||||
group by date_format(due_date,'%M-%Y')
|
||||
|
||||
order by year(due_date),month(due_date)
|
@ -1,30 +0,0 @@
|
||||
# Search Criteria, lease_monthly_future_installment_inflows
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2011-08-29 13:45:35',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-08-29 13:45:35',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
|
||||
'criteria_name': 'Lease Monthly Future Installment Inflows',
|
||||
'doc_type': 'GL Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'standard': 'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, lease_monthly_future_installment_inflows
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': 'lease_monthly_future_installment_inflows'
|
||||
}
|
||||
]
|
@ -1,30 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1});
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
// this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df.filter_hide=1;
|
||||
|
||||
}
|
||||
|
||||
$dh(this.mytabs.tabs['More Filters']);
|
||||
$dh(this.mytabs.tabs['Select Columns']);
|
@ -1,30 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
data =[
|
||||
['Agreement No.','Data','100px',''],
|
||||
['Lessee Name','Data','300px',''],
|
||||
['Amount','Currency','120px',''],
|
||||
['Age','Data','100px','']
|
||||
]
|
||||
|
||||
for d in data:
|
||||
colnames.append(d[0])
|
||||
coltypes.append(d[1])
|
||||
colwidths.append(d[2])
|
||||
coloptions.append(d[3])
|
||||
col_idx[d[0]] = len(colnames)-1
|
||||
|
@ -1,7 +0,0 @@
|
||||
select la.name,la.account,lai.amount,cast('%(date)s' as date)-due_date as age
|
||||
|
||||
from `tabLease Agreement` la,`tabLease Installment` lai
|
||||
|
||||
where la.name=lai.parent and lai.due_date<cast('%(date)s' as date) and (lai.cheque_date is null or lai.cheque_date > cast('%(date)s' as date))
|
||||
|
||||
order by cast('%(date)s' as date)-due_date desc
|
@ -1,30 +0,0 @@
|
||||
# Search Criteria, lease_over_due_list
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2011-08-29 13:45:35',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-08-29 13:45:35',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
|
||||
'criteria_name': 'Lease Over Due List',
|
||||
'doc_type': 'GL Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'standard': 'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, lease_over_due_list
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': 'lease_over_due_list'
|
||||
}
|
||||
]
|
@ -1,30 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1});
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
// this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df.filter_hide=1;
|
||||
|
||||
}
|
||||
|
||||
$dh(this.mytabs.tabs['More Filters']);
|
||||
$dh(this.mytabs.tabs['Select Columns']);
|
@ -1,32 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
data =[
|
||||
['Lessee Name','Data','300px',''],
|
||||
['Below 30 Days','Currency','120px',''],
|
||||
['Below 90 Days','Currency','120px',''],
|
||||
['Below 180 Days','Currency','120px',''],
|
||||
['Below 360 Days','Currency','120px',''],
|
||||
['Above 360 Days','Currency','120px',''],
|
||||
]
|
||||
|
||||
for d in data:
|
||||
colnames.append(d[0])
|
||||
coltypes.append(d[1])
|
||||
colwidths.append(d[2])
|
||||
coloptions.append(d[3])
|
||||
col_idx[d[0]] = len(colnames)-1
|
||||
|
@ -1,9 +0,0 @@
|
||||
select account,sum(od_30)as od_30,sum(od_90)as od_90,sum(od_180)as od_180,sum(od_360)as od_360,sum(od_1yr)as od_1yr from
|
||||
(
|
||||
select account,case when age<=30 then amount end as od_30,case when age between 31 and 90 then amount end as od_90,case when age between 91 and 180 then amount end as od_180,case when age between 181 and 360 then amount end as od_360,case when age>360 then amount end as od_1yr from
|
||||
(
|
||||
select la.account,lai.amount,cast('%(date)s' as date)-due_date as age
|
||||
from `tabLease Agreement` la,`tabLease Installment` lai
|
||||
where la.name=lai.parent and lai.due_date<'%(date)s' and (lai.cheque_date is null or lai.cheque_date > '%(date)s')
|
||||
)a
|
||||
)b group by account order by account
|
@ -1,30 +0,0 @@
|
||||
# Search Criteria, lease_overdue_age_wise
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2011-08-29 13:45:35',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-08-29 13:45:35',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
|
||||
'criteria_name': 'Lease Overdue Age Wise',
|
||||
'doc_type': 'GL Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'standard': 'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, lease_overdue_age_wise
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': 'lease_overdue_age_wise'
|
||||
}
|
||||
]
|
@ -1,27 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1});
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=sys_defaults.year_start_date;
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
}
|
||||
|
||||
$dh(this.mytabs.tabs['More Filters']);
|
||||
$dh(this.mytabs.tabs['Select Columns']);
|
@ -1,29 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
data =[
|
||||
['Month','Data','100px',''],
|
||||
['Year','Data','100px',''],
|
||||
['Amount','Currency','120px','']
|
||||
]
|
||||
|
||||
for d in data:
|
||||
colnames.append(d[0])
|
||||
coltypes.append(d[1])
|
||||
colwidths.append(d[2])
|
||||
coloptions.append(d[3])
|
||||
col_idx[d[0]] = len(colnames)-1
|
||||
|
@ -1,5 +0,0 @@
|
||||
SELECT date_format(gl.posting_date,'%M'),year(gl.posting_date),sum(gl.credit) as amount
|
||||
FROM `tabGL Entry` gl, `tabAccount` a
|
||||
WHERE gl.account=a.name and a.master_type='Customer' and gl.credit>0 and gl.posting_date between '%(date)s' and '%(date1)s'
|
||||
GROUP BY month(gl.posting_date),year(gl.posting_date)
|
||||
ORDER BY year(gl.posting_date),month(gl.posting_date)
|
@ -1,30 +0,0 @@
|
||||
# Search Criteria, lease_receipt_summary_month_wise
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2011-07-27 16:17:04',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-07-27 16:17:04',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
|
||||
'criteria_name': 'Lease Receipt Summary Month Wise',
|
||||
'doc_type': 'GL Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'standard': 'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, lease_receipt_summary_month_wise
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': 'lease_receipt_summary_month_wise'
|
||||
}
|
||||
]
|
@ -1,27 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1});
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=sys_defaults.year_start_date;
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
}
|
||||
|
||||
$dh(this.mytabs.tabs['More Filters']);
|
||||
$dh(this.mytabs.tabs['Select Columns']);
|
@ -1,28 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
data =[
|
||||
['Lessee Name','Data','300px',''],
|
||||
['Amount','Currency','120px','']
|
||||
]
|
||||
|
||||
for d in data:
|
||||
colnames.append(d[0])
|
||||
coltypes.append(d[1])
|
||||
colwidths.append(d[2])
|
||||
coloptions.append(d[3])
|
||||
col_idx[d[0]] = len(colnames)-1
|
||||
|
@ -1,5 +0,0 @@
|
||||
SELECT gl.account,sum(gl.credit) as amount
|
||||
FROM `tabGL Entry` gl, `tabAccount` a
|
||||
WHERE gl.account=a.name and a.master_type='Customer' and gl.posting_date between '%(date)s' and '%(date1)s' and ifnull(gl.is_cancelled, 'No') = 'No'
|
||||
GROUP BY gl.account
|
||||
ORDER BY posting_date
|
@ -1,31 +0,0 @@
|
||||
# Search Criteria, lease_receipts_client_wise
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2011-08-29 13:45:36',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-08-29 13:45:36',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
|
||||
'criteria_name': 'Lease Receipts Client Wise',
|
||||
'doc_type': 'GL Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'page_len': 50,
|
||||
'standard': 'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, lease_receipts_client_wise
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': 'lease_receipts_client_wise'
|
||||
}
|
||||
]
|
@ -1,30 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1});
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
// this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date());
|
||||
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df.filter_hide=1;
|
||||
|
||||
}
|
||||
|
||||
$dh(this.mytabs.tabs['More Filters']);
|
||||
$dh(this.mytabs.tabs['Select Columns']);
|
@ -1,28 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
data =[
|
||||
['Year','Data','100px',''],
|
||||
['Amount','Currency','120px','']
|
||||
]
|
||||
|
||||
for d in data:
|
||||
colnames.append(d[0])
|
||||
coltypes.append(d[1])
|
||||
colwidths.append(d[2])
|
||||
coloptions.append(d[3])
|
||||
col_idx[d[0]] = len(colnames)-1
|
||||
|
@ -1,9 +0,0 @@
|
||||
select year(date_sub(due_date,interval 6 MONTH)) as yr,sum(amount)
|
||||
|
||||
from `tabLease Agreement` la,`tabLease Installment` lai
|
||||
|
||||
where la.name=lai.parent and (lai.cheque_date is null or lai.cheque_date > '%(date)s')
|
||||
|
||||
group by year(date_sub(due_date,interval 6 MONTH))
|
||||
|
||||
order by yr
|
@ -1,30 +0,0 @@
|
||||
# Search Criteria, lease_yearly_future_installment_inflows
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2011-08-29 13:45:36',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-08-29 13:45:36',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
|
||||
'criteria_name': 'Lease Yearly Future Installment Inflows',
|
||||
'doc_type': 'GL Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'standard': 'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, lease_yearly_future_installment_inflows
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': 'lease_yearly_future_installment_inflows'
|
||||
}
|
||||
]
|
@ -1,27 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
flds = ['ID','Owner','Cost Center','From Posting Date', 'To Posting Date', 'Against Voucher','Voucher Type','Voucher No','Is Cancelled','Is Opening','Remarks', 'From Aging Date', 'To Aging Date', 'Company']
|
||||
for(i=0;i<flds.length;i++){
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +flds[i]].df.filter_hide = 1;
|
||||
}
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'Fiscal Year'].df['report_default']=sys_defaults.fiscal_year;
|
||||
this.filter_fields_dict['GL Entry'+FILTER_SEP +'Fiscal Year'].df.in_first_page = 1;
|
||||
}
|
||||
|
||||
this.mytabs.items['Select Columns'].hide();
|
||||
this.mytabs.items['More Filters'].hide();
|
@ -1,29 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
if not filter_values['account']:
|
||||
msgprint("Please Enter filter value for Account")
|
||||
raise Exception
|
||||
|
||||
colwidths[col_idx['Fiscal Month']] = '120px'
|
||||
colwidths[col_idx['Debit']] = '120px'
|
||||
colwidths[col_idx['Credit']] = '120px'
|
||||
|
||||
|
||||
month_lst={'1':'Jan','2':'Feb','3':'Mar','4':'Apr','5':'May','6':'Jun','7':'Jul','8':'Aug','9':'Sept','10':'Oct','11':'Nov','12':'Dec'}
|
||||
for r in res:
|
||||
mnt = '%s'%r[col_idx['Fiscal Month']]
|
||||
r[col_idx['Fiscal Month']]=month_lst[mnt]
|
@ -1,36 +0,0 @@
|
||||
# Search Criteria, monthly_ledger_summary_report
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:43',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:44',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'add_col': u"month(`tabGL Entry`.posting_date) AS 'Fiscal Month'\nsum(`tabGL Entry`.debit) AS 'Debit'\nsum(`tabGL Entry`.credit) AS 'Credit'",
|
||||
'add_cond': u'(`tabGL Entry`.debit > 0 or `tabGL Entry`.credit > 0)',
|
||||
'criteria_name': u'Monthly Ledger Summary Report',
|
||||
'dis_filters': u'company',
|
||||
'doc_type': u'GL Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': u"{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':''}",
|
||||
'group_by': u'month(`tabGL Entry`.posting_date)',
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'page_len': 50,
|
||||
'sort_by': u'`Fiscal Month`',
|
||||
'sort_order': u'ASC',
|
||||
'standard': u'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, monthly_ledger_summary_report
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': u'monthly_ledger_summary_report'
|
||||
}
|
||||
]
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:32',
|
||||
'creation': '2012-04-03 12:49:51',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:32',
|
||||
'modified': '2012-04-03 12:49:51',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
@ -17,7 +17,7 @@
|
||||
'doc_type': u'Profile',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': u"{'DocType\x01Period':'Monthly'}",
|
||||
'module': u'Analysis',
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'sort_by': u'`tabProfile`.`name`',
|
||||
'sort_order': u'DESC',
|
||||
@ -29,4 +29,4 @@
|
||||
'doctype': 'Search Criteria',
|
||||
'name': u'monthly_transaction_summary'
|
||||
}
|
||||
]
|
||||
]
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:44',
|
||||
'creation': '2012-04-03 12:49:51',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:44',
|
||||
'modified': '2012-04-03 12:49:51',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'jai@webnotestech.com'
|
||||
},
|
||||
|
@ -1,42 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Voucher Type'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Is Opening'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher Detail'+FILTER_SEP +'Account'].df.filter_hide = 0;
|
||||
|
||||
this.add_filter({fieldname:'range_1', label:'Range 1', fieldtype:'Data', ignore : 1, parent:'GL Entry'});
|
||||
this.add_filter({fieldname:'range_2', label:'Range 2', fieldtype:'Data', ignore : 1, parent:'GL Entry'});
|
||||
this.add_filter({fieldname:'range_3', label:'Range 3', fieldtype:'Data', ignore : 1, parent:'GL Entry'});
|
||||
this.add_filter({fieldname:'range_4', label:'Range 4', fieldtype:'Data', ignore : 1, parent:'GL Entry'});
|
||||
|
||||
this.add_filter({fieldname:'aging_based_on', label:'Aging Based On', fieldtype:'Select', options:NEWLINE+'Transaction Date'+NEWLINE+'Aging Date',ignore : 1, parent:'Purchase Invoice', 'report_default':'Aging Date'});
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.in_first_page = 1;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.in_first_page = 1;
|
||||
this.filter_fields_dict['Journal Voucher Detail'+FILTER_SEP +'Account'].df.in_first_page = 1;
|
||||
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date());
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df['report_default']=sys_defaults.company;
|
||||
|
||||
}
|
||||
this.mytabs.items['Select Columns'].hide()
|
@ -1,105 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#check mendatory
|
||||
if not filter_values.get('posting_date') or not filter_values.get('posting_date1'):
|
||||
msgprint("Please select From Posting Date and To Posting Date in 'Set Filters' section")
|
||||
raise Exception
|
||||
else:
|
||||
from_date = filter_values.get('posting_date')
|
||||
to_date = filter_values.get('posting_date1')
|
||||
|
||||
if not filter_values['range_1'] or not filter_values['range_2'] or not filter_values['range_3'] or not filter_values['range_4']:
|
||||
msgprint("Please select aging ranges in no of days in 'Set Filters' section")
|
||||
raise Exception
|
||||
|
||||
# ageing based on
|
||||
aging_based_on = 'Aging Date'
|
||||
if filter_values.has_key('aging_based_on') and filter_values['aging_based_on']:
|
||||
aging_based_on = filter_values['aging_based_on'].split(NEWLINE)[-1]
|
||||
|
||||
|
||||
# Add columns
|
||||
# -----------
|
||||
row_list = [['ID','Data','150px',''],
|
||||
['Account','Data','150px',''],
|
||||
['Credit','Data','150px',''],
|
||||
['Debit','Data','150px',''],
|
||||
['Against Payable','Data','150px',''],
|
||||
['Is Advance','Data','150px',''],
|
||||
['Transaction Date','Date','150px',''],
|
||||
['Aging Date','Date','150px',''],
|
||||
['Cheque No','Data','100px',''],
|
||||
['Cheque Date','Date','150px',''],
|
||||
['Supplier Type','Data','150px',''],
|
||||
['Remark','Data','250px',''],
|
||||
['Advance','Data','250px',''],
|
||||
['PV Transaction Date','Date','150px',''],
|
||||
['PV Aging Date','Date','150px',''],
|
||||
['Age (Days)','Data','100px',''],
|
||||
['0-'+cstr(filter_values['range_1']),'Currency','100px',''],
|
||||
[cstr(cint(filter_values['range_1']) + 1)+ '-' +cstr(filter_values['range_2']),'Currency','100px',''],
|
||||
[cstr(cint(filter_values['range_2']) + 1)+ '-' +cstr(filter_values['range_3']),'Currency','100px',''],
|
||||
[cstr(cint(filter_values['range_3']) + 1)+ '-' +cstr(filter_values['range_4']),'Currency','100px',''],
|
||||
[cstr(filter_values['range_4']) + '-Above','Currency','100px','']]
|
||||
|
||||
for r in row_list:
|
||||
colnames.append(r[0])
|
||||
coltypes.append(r[1])
|
||||
colwidths.append(r[2])
|
||||
coloptions.append(r[3])
|
||||
col_idx[r[0]] = len(colnames)-1
|
||||
|
||||
|
||||
for r in res:
|
||||
if r[col_idx['Against Payable']]:
|
||||
dt=sql("select date(modified), aging_date from `tabPurchase Invoice` where name='%s'"%r[col_idx['Against Payable']])
|
||||
r.append('')
|
||||
r.append(dt and cstr(dt[0][0]) or '')
|
||||
r.append(dt and cstr(dt[0][1]) or '')
|
||||
else:
|
||||
r.append(r[col_idx['Debit']])
|
||||
r.append('')
|
||||
r.append('')
|
||||
|
||||
# Aging Credit Amount
|
||||
val_l1 = val_l2 = val_l3 = val_l4 = val_l5_above = diff = 0
|
||||
|
||||
if r[col_idx['Against Payable']]:
|
||||
amt = flt(r[col_idx['Debit']]) or (-1)*flt(r[col_idx['Credit']])
|
||||
|
||||
if aging_based_on == 'Transaction Date' and r[col_idx['PV Transaction Date']]:
|
||||
diff = (getdate(r[col_idx['Transaction Date']]) - getdate(r[col_idx['PV Transaction Date']])).days
|
||||
elif aging_based_on == 'Aging Date' and r[col_idx['PV Aging Date']]:
|
||||
diff = (getdate(r[col_idx['Aging Date']]) - getdate(r[col_idx['PV Aging Date']])).days
|
||||
|
||||
if diff < cint(filter_values['range_1']):
|
||||
val_l1 = amt
|
||||
if diff >= cint(filter_values['range_1']) and diff < cint(filter_values['range_2']):
|
||||
val_l2 = amt
|
||||
if diff >= cint(filter_values['range_2']) and diff < cint(filter_values['range_3']):
|
||||
val_l3 = amt
|
||||
if diff >= cint(filter_values['range_3']) and diff < cint(filter_values['range_4']):
|
||||
val_l4 = amt
|
||||
if diff >= cint(filter_values['range_4']):
|
||||
val_l5_above = amt
|
||||
|
||||
r.append(diff)
|
||||
r.append(val_l1)
|
||||
r.append(val_l2)
|
||||
r.append(val_l3)
|
||||
r.append(val_l4)
|
||||
r.append(val_l5_above)
|
@ -1,12 +0,0 @@
|
||||
SELECT `tabJournal Voucher`.`name`,`tabJournal Voucher Detail`.`account`,`tabJournal Voucher Detail`.`credit`,`tabJournal Voucher Detail`.`debit`,`tabJournal Voucher Detail`.`against_voucher`,`tabJournal Voucher Detail`.`is_advance`,`tabJournal Voucher`.`voucher_date`,`tabJournal Voucher`.`aging_date`,`tabJournal Voucher`.`cheque_no`,`tabJournal Voucher`.`cheque_date`,`tabSupplier`.`supplier_type`,`tabJournal Voucher`.`remark`
|
||||
FROM `tabJournal Voucher Detail`,`tabJournal Voucher`,`tabAccount`,`tabSupplier`
|
||||
WHERE `tabJournal Voucher`.docstatus=1
|
||||
AND `tabJournal Voucher`.`posting_date`>='%(posting_date)s'
|
||||
AND `tabJournal Voucher`.`posting_date`<='%(posting_date1)s'
|
||||
AND `tabJournal Voucher`.`company` LIKE '%(company)s%%'
|
||||
AND `tabJournal Voucher Detail`.`account` LIKE '%(account)s%%'
|
||||
AND `tabAccount`.`master_type` = 'Supplier'
|
||||
AND `tabAccount`.`account_name` = `tabSupplier`.`name`
|
||||
AND `tabJournal Voucher Detail`.`account` = `tabAccount`.`name`
|
||||
AND `tabJournal Voucher Detail`.`parent` = `tabJournal Voucher`.`name`
|
||||
ORDER BY `tabJournal Voucher`.`name`
|
@ -1,33 +0,0 @@
|
||||
# Search Criteria, payment_report
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:44',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:44',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': u'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Is Advance',
|
||||
'criteria_name': u'Payment Report',
|
||||
'doc_type': u'Journal Voucher Detail',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': u"{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90','Sales Invoice\x01Aging Based On':'','Purchase Invoice\x01Aging Based On':''}",
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'parent_doc_type': u'Journal Voucher',
|
||||
'sort_by': u'`tabJournal Voucher`.`aging_date`',
|
||||
'sort_order': u'DESC',
|
||||
'standard': u'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, payment_report
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': u'payment_report'
|
||||
}
|
||||
]
|
@ -1,44 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
|
||||
this.add_filter({fieldname:'main_acc_head', label:'Main Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
this.add_filter({fieldname:'edu_cess_acc_head', label:'Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
this.add_filter({fieldname:'sh_edu_cess_acc_head', label:'S.H.Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
|
||||
// un-hide fields
|
||||
//this.add_filter({fieldname:'company', label:'Company', fieldtype:'Link', options:'Company', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
//this.add_filter({fieldname:'fiscal_year', label:'Fiscal Year', fieldtype:'Link', options:'Fiscal Year', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
//this.add_filter({fieldname:'posting_date', label:'Posting Date', fieldtype:'Date', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
|
||||
|
||||
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0;
|
||||
|
||||
// set defaults
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.in_first_page = 1;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.in_first_page = 1;
|
||||
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date());
|
||||
|
||||
//this.large_report = 1;
|
||||
}
|
@ -1,86 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Add columns
|
||||
# -----------
|
||||
row_list = [['Date', 'Date', '150px', '']
|
||||
,['INVOICE', 'Date', '150px', '']
|
||||
,['Baisc Excise Duty', 'Currency', '150px', '']
|
||||
,['Education Cess', 'Currency', '150px', '']
|
||||
,['S.H.Education Cess', 'Currency', '150px', '']
|
||||
,['Remarks', 'Data', '150px', '']
|
||||
]
|
||||
|
||||
for r in row_list:
|
||||
colnames.append(r[0])
|
||||
coltypes.append(r[1])
|
||||
colwidths.append(r[2])
|
||||
coloptions.append(r[3])
|
||||
col_idx[r[0]] = len(colnames)-1
|
||||
|
||||
# Get Object Of GL Control
|
||||
#import webnotes
|
||||
#import webnotes.model.code
|
||||
#from webnotes.model.code import get_obj
|
||||
#glc = webnotes.model.code.get_obj('GL Control')
|
||||
|
||||
# Get Year Start Date
|
||||
ysd = sql("select year_start_date from `tabFiscal Year` where name='%s'" % filter_values['fiscal_year'])
|
||||
ysd = ysd and ysd[0][0] or ''
|
||||
|
||||
# get as_on_date for opening
|
||||
as_on_date = ''
|
||||
if filter_values.get('posting_date'):
|
||||
as_on_date = add_days(filter_values['posting_date'], -1)
|
||||
|
||||
# Get Opening Balance
|
||||
def get_opening_balance(acc, fy, as_on_date, ysd, get_opening_balance):
|
||||
#import webnotes
|
||||
#import webnotes.model.code
|
||||
#from webnotes.model.code import get_obj
|
||||
#glc = webnotes.model.code.get_obj('GL Control')
|
||||
glc = get_obj('GL Control')
|
||||
acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % acc)
|
||||
return glc.get_as_on_balance(acc, fy, as_on_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
|
||||
|
||||
cum_sum_main_acc_head = cum_sum_add_acc_head = cum_sum_cvd_acc_head = cum_sum_edu_cess_acc_head = cum_sum_sh_edu_cess_acc_head = 0
|
||||
openg_main_acc_head = openg_add_acc_head = openg_cvd_acc_head = openg_edu_cess_acc_head = openg_sh_edu_cess_acc_head = 0
|
||||
|
||||
# Get Opening of Basic Excise Duty
|
||||
if not filter_values['main_acc_head']:
|
||||
msgprint("Please Enter Main Account Head")
|
||||
raise Exception
|
||||
cum_sum_main_acc_head = openg_main_acc_head = get_opening_balance(filter_values['main_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance)
|
||||
|
||||
# Get Opening of edu_cess_acc_head
|
||||
if not filter_values['edu_cess_acc_head'] :
|
||||
msgprint("Please Enter Edu Cess Account Head")
|
||||
raise Exception
|
||||
cum_sum_edu_cess_acc_head = openg_edu_cess_acc_head = get_opening_balance(filter_values['edu_cess_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance)
|
||||
|
||||
# Get Opening of sh_edu_cess_acc_head
|
||||
if not filter_values['sh_edu_cess_acc_head'] :
|
||||
msgprint("Please Enter S.H.Edu Cess Account Head")
|
||||
raise Exception
|
||||
cum_sum_sh_edu_cess_acc_head = openg_sh_edu_cess_acc_head = get_opening_balance(filter_values['sh_edu_cess_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance)
|
||||
|
||||
out = []
|
||||
|
||||
out.append(['Opening Balance of Duty in Credit', '', flt(openg_main_acc_head) + flt(openg_add_acc_head) , flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head),''])
|
||||
out += res
|
||||
#if from_export == 0:
|
||||
# msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please click on 'Export' to open in a spreadsheet")
|
||||
# raise Exception
|
@ -1,28 +0,0 @@
|
||||
SELECT t1.posting_date, t1.name, SUM(CASE WHEN t2.account_head like '%(main_acc_head)s%' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(edu_cess_acc_head)s' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(sh_edu_cess_acc_head)s' THEN t2.tax_amount ELSE 0.00 END), '' AS remarks
|
||||
FROM `tabDelivery Note` t1, `tabRV Tax Detail` t2
|
||||
WHERE t2.parent = t1.name
|
||||
AND t2.parenttype = 'Delivery Note'
|
||||
AND (t2.account_head LIKE '%(main_acc_head)s%%'
|
||||
OR t2.account_head LIKE '%(edu_cess_acc_head)s%%'
|
||||
OR t2.account_head LIKE '%(sh_edu_cess_acc_head)s%%')
|
||||
AND t1.`posting_date` >= '%(posting_date)s'
|
||||
AND t1.`posting_date` <= '%(posting_date1)s'
|
||||
AND t1.docstatus =1
|
||||
GROUP BY t1.`name`
|
||||
|
||||
UNION
|
||||
|
||||
SELECT t1.posting_date, t1.name, SUM(CASE WHEN t2.account like '%(main_acc_head)s' THEN t2.credit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(edu_cess_acc_head)s' THEN t2.credit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(sh_edu_cess_acc_head)s' THEN t2.credit ELSE 0.00 END), t1.`remark`
|
||||
FROM `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2
|
||||
WHERE (t2.credit is not NULL OR t2.credit != '')
|
||||
AND t2.credit > 0
|
||||
AND t2.parent = t1.name
|
||||
AND (t2.account LIKE '%(main_acc_head)s%'
|
||||
OR t2.account LIKE '%(edu_cess_acc_head)s%'
|
||||
OR t2.account LIKE '%(sh_edu_cess_acc_head)s%')
|
||||
AND t1.`posting_date` >= '%(posting_date)s'
|
||||
AND t1.`posting_date` <= '%(posting_date1)s'
|
||||
AND t1.docstatus =1
|
||||
GROUP BY t2.`parent`
|
||||
|
||||
ORDER BY `posting_date`,`name`
|
@ -1,34 +0,0 @@
|
||||
# Search Criteria, progressive_total_excise_duty
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:32',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:32',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'jai@webnotestech.com'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': u'Journal Voucher\x01ID,Journal Voucher\x01Owner,Journal Voucher\x01Voucher Type,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher\x01Is Opening,Journal Voucher\x01Fiscal Year,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Clearance Date,Journal Voucher\x01TDS Applicable,Journal Voucher\x01TDS Category,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Cost Center,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
|
||||
'criteria_name': u'Progressive Total Excise Duty',
|
||||
'doc_type': u'Journal Voucher Detail',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': u"{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'page_len': 50,
|
||||
'parent_doc_type': u'Journal Voucher',
|
||||
'sort_by': u'ID',
|
||||
'sort_order': u'DESC',
|
||||
'standard': u'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, progressive_total_excise_duty
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': u'progressive_total_excise_duty'
|
||||
}
|
||||
]
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 13:33:32',
|
||||
'creation': '2012-04-03 12:49:52',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 13:33:32',
|
||||
'modified': '2012-04-03 12:49:52',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:44',
|
||||
'creation': '2012-04-03 12:49:52',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:44',
|
||||
'modified': '2012-04-03 12:49:52',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
@ -1,43 +0,0 @@
|
||||
// ERPNext - web based ERP (http://erpnext.com)
|
||||
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
report.customize_filters = function() {
|
||||
this.hide_all_filters();
|
||||
this.add_filter({fieldname:'main_acc_head', label:'Main Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
this.add_filter({fieldname:'edu_cess_acc_head', label:'Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
this.add_filter({fieldname:'sh_edu_cess_acc_head', label:'S.H.Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
|
||||
// un-hide fields
|
||||
//this.add_filter({fieldname:'company', label:'Company', fieldtype:'Link', options:'Company', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
//this.add_filter({fieldname:'fiscal_year', label:'Fiscal Year', fieldtype:'Link', options:'Fiscal Year', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
//this.add_filter({fieldname:'posting_date', label:'Posting Date', fieldtype:'Date', ignore : 1, parent:'Journal Voucher Detail'});
|
||||
|
||||
|
||||
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0;
|
||||
|
||||
// set defaults
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.in_first_page = 1;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.in_first_page = 1;
|
||||
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date;
|
||||
this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date());
|
||||
|
||||
//this.large_report = 1;
|
||||
}
|
@ -1,135 +0,0 @@
|
||||
# ERPNext - web based ERP (http://erpnext.com)
|
||||
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Add columns
|
||||
# -----------
|
||||
row_list = [['Date', 'Date', '150px', '']
|
||||
,['ARI/INVOICE/Other Approved document/Bill of entry No.', 'Date', '150px', '']
|
||||
,['Date', 'Date', '150px', '']
|
||||
,['Service Tax', 'Currency', '150px', '']
|
||||
,['Education Cess', 'Currency', '150px', '']
|
||||
,['S.H.Education Cess', 'Currency', '150px', '']
|
||||
,[' Service Tax ', 'Currency', '150px', '']
|
||||
,[' Education Cess ', 'Currency', '150px', '']
|
||||
,[' S.H.Education Cess ', 'Currency', '150px', '']
|
||||
,['ARI/INVOICE/ Other Approved document/Bill of entry No.', 'Data', '100px', '']
|
||||
,['Date', 'Date', '150px', '']
|
||||
,[' Service Tax', 'Currency', '150px', '']
|
||||
,[' Education Cess', 'Currency', '150px', '']
|
||||
,[' S.H.Education Cess', 'Currency', '150px', '']
|
||||
,['Service Tax ', 'Currency', '150px', '']
|
||||
,['Education Cess ', 'Currency', '150px', '']
|
||||
,['S.H.Education Cess ', 'Currency', '150px', '']
|
||||
,['Remarks', 'Data', '150px', '']
|
||||
]
|
||||
|
||||
|
||||
for r in row_list:
|
||||
colnames.append(r[0])
|
||||
coltypes.append(r[1])
|
||||
colwidths.append(r[2])
|
||||
coloptions.append(r[3])
|
||||
col_idx[r[0]] = len(colnames)-1
|
||||
|
||||
# Get Object Of GL Control
|
||||
#import webnotes
|
||||
#import webnotes.model.code
|
||||
#from webnotes.model.code import get_obj
|
||||
#glc = webnotes.model.code.get_obj('GL Control')
|
||||
|
||||
# Get Year Start Date
|
||||
ysd = sql("select year_start_date from `tabFiscal Year` where name='%s'" % filter_values['fiscal_year'])
|
||||
ysd = ysd and ysd[0][0] or ''
|
||||
|
||||
# get as_on_date for opening
|
||||
as_on_date = ''
|
||||
if filter_values.get('posting_date'):
|
||||
as_on_date = add_days(filter_values['posting_date'], -1)
|
||||
|
||||
# Get Opening Balance
|
||||
def get_opening_balance(acc, fy, as_on_date, ysd, get_opening_balance):
|
||||
#import webnotes
|
||||
#import webnotes.model.code
|
||||
#from webnotes.model.code import get_obj
|
||||
#glc = webnotes.model.code.get_obj('GL Control')
|
||||
glc = get_obj('GL Control')
|
||||
acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % acc)
|
||||
return glc.get_as_on_balance(acc, fy, as_on_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
|
||||
|
||||
cum_sum_main_acc_head = cum_sum_edu_cess_acc_head = cum_sum_sh_edu_cess_acc_head = 0
|
||||
openg_main_acc_head = openg_edu_cess_acc_head = openg_sh_edu_cess_acc_head = 0
|
||||
|
||||
# Get Opening of Basic Excise Duty
|
||||
if not filter_values['main_acc_head']:
|
||||
msgprint("Please Enter Main Account Head")
|
||||
raise Exception
|
||||
cum_sum_main_acc_head = openg_main_acc_head = get_opening_balance(filter_values['main_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance)
|
||||
|
||||
# Get Opening of edu_cess_acc_head
|
||||
if not filter_values['edu_cess_acc_head'] :
|
||||
msgprint("Please Enter Edu Cess Account Head")
|
||||
raise Exception
|
||||
cum_sum_edu_cess_acc_head = openg_edu_cess_acc_head = get_opening_balance(filter_values['edu_cess_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance)
|
||||
|
||||
# Get Opening of sh_edu_cess_acc_head
|
||||
if not filter_values['sh_edu_cess_acc_head'] :
|
||||
msgprint("Please Enter S.H.Edu Cess Account Head")
|
||||
raise Exception
|
||||
cum_sum_sh_edu_cess_acc_head = openg_sh_edu_cess_acc_head = get_opening_balance(filter_values['sh_edu_cess_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance)
|
||||
|
||||
msgprint("Column No "+ cstr(len(col_idx)))
|
||||
msgprint(openg_sh_edu_cess_acc_head)
|
||||
msgprint(openg_main_acc_head)
|
||||
for r in res:
|
||||
msgprint(r)
|
||||
r[col_idx['Service Tax']] = flt(r[col_idx['Education Cess']])
|
||||
r[col_idx['Education Cess']] = flt(r[col_idx['S.H.Education Cess']])
|
||||
r[col_idx['S.H.Education Cess']] = flt(r[col_idx[' Service Tax ']])
|
||||
|
||||
remarks = r[col_idx[' Education Cess ']]
|
||||
|
||||
cum_sum_main_acc_head = flt(cum_sum_main_acc_head) + flt(r[col_idx['Service Tax']])
|
||||
r[col_idx[' Service Tax ']] = cum_sum_main_acc_head
|
||||
|
||||
cum_sum_edu_cess_acc_head = flt(cum_sum_edu_cess_acc_head) + flt(r[col_idx['Education Cess']])
|
||||
r[col_idx[' Education Cess ']] = cum_sum_edu_cess_acc_head
|
||||
|
||||
cum_sum_sh_edu_cess_acc_head = flt(cum_sum_sh_edu_cess_acc_head) + flt(r[col_idx['S.H.Education Cess']])
|
||||
r.append(cum_sum_sh_edu_cess_acc_head)
|
||||
|
||||
r.append('')
|
||||
r.append('')
|
||||
|
||||
r.append(0)
|
||||
r.append(0)
|
||||
r.append(0)
|
||||
|
||||
r.append(cum_sum_main_acc_head)
|
||||
r.append(cum_sum_edu_cess_acc_head)
|
||||
r.append(cum_sum_sh_edu_cess_acc_head)
|
||||
|
||||
r.append(remarks)
|
||||
|
||||
#msgprint(len(res))
|
||||
#msgprint(query)
|
||||
out = []
|
||||
|
||||
msgprint(len(['Opening Balance of Duty in Credit', '', '', '', '', '', '', '', '', '', '', '', '', '', flt(openg_main_acc_head) , flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head)]))
|
||||
out.append(['Opening Balance of Duty in Credit', '', '', '', '', '', '', '', '', '', '', '', '', '', flt(openg_main_acc_head) , flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head)])
|
||||
out += res
|
||||
#if from_export == 0:
|
||||
# msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please click on 'Export' to open in a spreadsheet")
|
||||
# raise Exception
|
@ -1,13 +0,0 @@
|
||||
SELECT t1.posting_date, t1.bill_no, t1.bill_date, t1.name, SUM(CASE WHEN t2.account like '%(main_acc_head)s%' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(edu_cess_acc_head)s' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(sh_edu_cess_acc_head)s' THEN t2.debit ELSE 0.00 END), t1.`remark`
|
||||
FROM `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2
|
||||
WHERE (t2.debit is not NULL OR t2.debit != '')
|
||||
AND t2.debit > 0
|
||||
AND t2.parent = t1.name
|
||||
AND (t2.account LIKE '%(main_acc_head)s%%'
|
||||
OR t2.account LIKE '%(edu_cess_acc_head)s%%'
|
||||
OR t2.account LIKE '%(sh_edu_cess_acc_head)s%%')
|
||||
AND t1.`posting_date` >= '%(posting_date)s'
|
||||
AND t1.`posting_date` <= '%(posting_date1)s'
|
||||
AND t1.docstatus =1
|
||||
GROUP BY t2.`parent`
|
||||
ORDER BY t1.`posting_date`,t1.`name`
|
@ -1,34 +0,0 @@
|
||||
# Search Criteria, service_tax_credit_account_-_inputs
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:44',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:44',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'jai@webnotestech.com'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
{
|
||||
'columns': u'Journal Voucher\x01ID,Journal Voucher\x01Owner,Journal Voucher\x01Voucher Type,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher\x01Is Opening,Journal Voucher\x01Fiscal Year,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Clearance Date,Journal Voucher\x01TDS Applicable,Journal Voucher\x01TDS Category,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Cost Center,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
|
||||
'criteria_name': u'Service Tax Credit Account - Inputs',
|
||||
'doc_type': u'Journal Voucher Detail',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': u"{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
|
||||
'module': u'Accounts',
|
||||
'name': '__common__',
|
||||
'page_len': 50,
|
||||
'parent_doc_type': u'Journal Voucher',
|
||||
'sort_by': u'ID',
|
||||
'sort_order': u'DESC',
|
||||
'standard': u'Yes'
|
||||
},
|
||||
|
||||
# Search Criteria, service_tax_credit_account_-_inputs
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': u'service_tax_credit_account_-_inputs'
|
||||
}
|
||||
]
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-03-30 14:50:44',
|
||||
'creation': '2012-04-03 12:49:53',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-03-30 14:50:44',
|
||||
'modified': '2012-04-03 12:49:53',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user