diff --git a/accounts/doctype/account/account.js b/accounts/doctype/account/account.js index eb8e765d8d3..6b06572d8eb 100644 --- a/accounts/doctype/account/account.js +++ b/accounts/doctype/account/account.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Onload diff --git a/accounts/doctype/account/account.py b/accounts/doctype/account/account.py index 98808f48a38..a6038ddd930 100644 --- a/accounts/doctype/account/account.py +++ b/accounts/doctype/account/account.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/account/test_account.py b/accounts/doctype/account/test_account.py index e979b89b7eb..10b3f9294ae 100644 --- a/accounts/doctype/account/test_account.py +++ b/accounts/doctype/account/test_account.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/accounts_settings/accounts_settings.py b/accounts/doctype/accounts_settings/accounts_settings.py index ed7b402328e..d1a4c25a1d4 100644 --- a/accounts/doctype/accounts_settings/accounts_settings.py +++ b/accounts/doctype/accounts_settings/accounts_settings.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/accounts/doctype/bank_reconciliation/bank_reconciliation.js index 793db62d072..43dba638ee3 100644 --- a/accounts/doctype/bank_reconciliation/bank_reconciliation.js +++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.add_fetch("bank_account", "company", "company"); diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/accounts/doctype/bank_reconciliation/bank_reconciliation.py index f19df48306e..479b57955cf 100644 --- a/accounts/doctype/bank_reconciliation/bank_reconciliation.py +++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py +++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/budget_control/budget_control.py b/accounts/doctype/budget_control/budget_control.py index 66a48a2deea..0aa64c86fc4 100644 --- a/accounts/doctype/budget_control/budget_control.py +++ b/accounts/doctype/budget_control/budget_control.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/budget_detail/budget_detail.py b/accounts/doctype/budget_detail/budget_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/budget_detail/budget_detail.py +++ b/accounts/doctype/budget_detail/budget_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/budget_distribution/budget_distribution.js b/accounts/doctype/budget_distribution/budget_distribution.js index 29e5e333605..deed0cb71db 100644 --- a/accounts/doctype/budget_distribution/budget_distribution.js +++ b/accounts/doctype/budget_distribution/budget_distribution.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.onload = function(doc,cdt,cdn){ if(doc.__islocal){ diff --git a/accounts/doctype/budget_distribution/budget_distribution.py b/accounts/doctype/budget_distribution/budget_distribution.py index 00d11f94f6f..2b3ce691c11 100644 --- a/accounts/doctype/budget_distribution/budget_distribution.py +++ b/accounts/doctype/budget_distribution/budget_distribution.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/budget_distribution/test_budget_distribution.py b/accounts/doctype/budget_distribution/test_budget_distribution.py index 3afb472baef..7ac835db7d8 100644 --- a/accounts/doctype/budget_distribution/test_budget_distribution.py +++ b/accounts/doctype/budget_distribution/test_budget_distribution.py @@ -1 +1,4 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [] \ No newline at end of file diff --git a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py +++ b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/c_form/c_form.js b/accounts/doctype/c_form/c_form.js index 0bc9ff1fe27..81fa1365de6 100644 --- a/accounts/doctype/c_form/c_form.js +++ b/accounts/doctype/c_form/c_form.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt //c-form js file // ----------------------------- diff --git a/accounts/doctype/c_form/c_form.py b/accounts/doctype/c_form/c_form.py index 25a8c3bfc19..0178a19f147 100644 --- a/accounts/doctype/c_form/c_form.py +++ b/accounts/doctype/c_form/c_form.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py +++ b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/cost_center/cost_center.js b/accounts/doctype/cost_center/cost_center.js index 7dc42236174..c3519bfc6c7 100644 --- a/accounts/doctype/cost_center/cost_center.js +++ b/accounts/doctype/cost_center/cost_center.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.accounts"); erpnext.accounts.CostCenterController = wn.ui.form.Controller.extend({ diff --git a/accounts/doctype/cost_center/cost_center.py b/accounts/doctype/cost_center/cost_center.py index b2b4c907458..6f977d775eb 100644 --- a/accounts/doctype/cost_center/cost_center.py +++ b/accounts/doctype/cost_center/cost_center.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/cost_center/test_cost_center.py b/accounts/doctype/cost_center/test_cost_center.py index 94a87fe70aa..7c63d7c5dd2 100644 --- a/accounts/doctype/cost_center/test_cost_center.py +++ b/accounts/doctype/cost_center/test_cost_center.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Cost Center", diff --git a/accounts/doctype/fiscal_year/fiscal_year.js b/accounts/doctype/fiscal_year/fiscal_year.js index 0f70cf5cdcc..c5500aa1f37 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.js +++ b/accounts/doctype/fiscal_year/fiscal_year.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc, dt, dn) { cur_frm.toggle_enable('year_start_date', doc.__islocal) diff --git a/accounts/doctype/fiscal_year/fiscal_year.py b/accounts/doctype/fiscal_year/fiscal_year.py index e23351c3aca..2544c96effa 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.py +++ b/accounts/doctype/fiscal_year/fiscal_year.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/fiscal_year/test_fiscal_year.py b/accounts/doctype/fiscal_year/test_fiscal_year.py index 456b15a89c0..594375d9c0e 100644 --- a/accounts/doctype/fiscal_year/test_fiscal_year.py +++ b/accounts/doctype/fiscal_year/test_fiscal_year.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals test_records = [ diff --git a/accounts/doctype/gl_entry/gl_entry.py b/accounts/doctype/gl_entry/gl_entry.py index 3a315002c8a..9af69ddc874 100644 --- a/accounts/doctype/gl_entry/gl_entry.py +++ b/accounts/doctype/gl_entry/gl_entry.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js index 867ebbb459b..eb081669b7f 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.js +++ b/accounts/doctype/journal_voucher/journal_voucher.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.accounts"); diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py index 8292bfad221..27b0518cf92 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.py +++ b/accounts/doctype/journal_voucher/journal_voucher.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/journal_voucher/test_journal_voucher.py b/accounts/doctype/journal_voucher/test_journal_voucher.py index feb1e2ca5a6..30e3ada60ac 100644 --- a/accounts/doctype/journal_voucher/test_journal_voucher.py +++ b/accounts/doctype/journal_voucher/test_journal_voucher.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py +++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt index 750449b5242..aea5d1256d8 100644 --- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt +++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-22 01:27:39", "docstatus": 0, - "modified": "2013-07-10 14:56:33", + "modified": "2013-08-02 18:15:56", "modified_by": "Administrator", "owner": "Administrator" }, @@ -88,6 +88,12 @@ "options": "Company:company:default_currency", "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "reference", + "fieldtype": "Section Break", + "label": "Reference" + }, { "doctype": "DocField", "fieldname": "against_voucher", diff --git a/accounts/doctype/mis_control/mis_control.py b/accounts/doctype/mis_control/mis_control.py index 35d2bc2cbf6..84350dcb722 100644 --- a/accounts/doctype/mis_control/mis_control.py +++ b/accounts/doctype/mis_control/mis_control.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.js b/accounts/doctype/mode_of_payment/mode_of_payment.js index e9e5738509a..956c7b2d95f 100644 --- a/accounts/doctype/mode_of_payment/mode_of_payment.js +++ b/accounts/doctype/mode_of_payment/mode_of_payment.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.set_query("default_account", function(doc) { return{ diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.py b/accounts/doctype/mode_of_payment/mode_of_payment.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/mode_of_payment/mode_of_payment.py +++ b/accounts/doctype/mode_of_payment/mode_of_payment.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js index d8c8c819e40..a48520cbd50 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Booking Entry Id // -------------------- diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py index 65524901e4a..dc2bcc585df 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py b/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py index 4a90928c491..9edfbc3c192 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py +++ b/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import unittest diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py +++ b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/accounts/doctype/period_closing_voucher/period_closing_voucher.js index fd458417835..e2aca234f18 100644 --- a/accounts/doctype/period_closing_voucher/period_closing_voucher.js +++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt //========================== On Load ================================================= diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/accounts/doctype/period_closing_voucher/period_closing_voucher.py index 09ed07dcaf5..c214a211c08 100644 --- a/accounts/doctype/period_closing_voucher/period_closing_voucher.py +++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/pos_setting/pos_setting.js b/accounts/doctype/pos_setting/pos_setting.js index c91e4ce12ae..f472d3a0639 100755 --- a/accounts/doctype/pos_setting/pos_setting.js +++ b/accounts/doctype/pos_setting/pos_setting.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.onload = function(doc,cdt,cdn){ return $c_obj(make_doclist(cdt,cdn),'get_series','',function(r,rt){ diff --git a/accounts/doctype/pos_setting/pos_setting.py b/accounts/doctype/pos_setting/pos_setting.py index 86c7135492b..a3984a61215 100755 --- a/accounts/doctype/pos_setting/pos_setting.py +++ b/accounts/doctype/pos_setting/pos_setting.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/pos_setting/test_pos_setting.py b/accounts/doctype/pos_setting/test_pos_setting.py index 91159b13336..13106c28a98 100644 --- a/accounts/doctype/pos_setting/test_pos_setting.py +++ b/accounts/doctype/pos_setting/test_pos_setting.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "POS Setting", diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.js b/accounts/doctype/purchase_invoice/purchase_invoice.js index e71a40815f1..b630499bd80 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.tname = "Purchase Invoice Item"; cur_frm.cscript.fname = "entries"; @@ -172,16 +159,13 @@ return{ } } -cur_frm.fields_dict['entries'].grid.get_field("expense_head").get_query = function(doc) { +cur_frm.set_query("expense_head", "entries", function(doc) { return{ - filters:{ - 'debit_or_credit':'Debit', - 'account_type': 'Expense Account', - 'group_or_ledger': 'Ledger', - 'company': doc.company - } - } -} + query: "accounts.doctype.purchase_invoice.purchase_invoice.get_expense_account", + filters: {'company': doc.company} + } +}); + cur_frm.cscript.expense_head = function(doc, cdt, cdn){ var d = locals[cdt][cdn]; if(d.idx == 1 && d.expense_head){ diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py index 3a8b51eb4b7..e9043c09b44 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -91,19 +78,9 @@ class DocType(BuyingController): return ret def set_supplier_defaults(self): - self.doc.fields.update(self.get_supplier()) self.doc.fields.update(self.get_credit_to()) super(DocType, self).set_supplier_defaults() - def get_supplier(self): - ret = {} - if self.doc.credit_to: - acc = webnotes.conn.get_value('Account',self.doc.credit_to,['master_name', 'credit_days']) - ret['supplier'] = acc[0] - ret['due_date'] = add_days(cstr(self.doc.posting_date), acc and cint(acc[1]) or 0) - - return ret - def get_advances(self): super(DocType, self).get_advances(self.doc.credit_to, "Purchase Invoice Advance", "advance_allocation_details", "debit") @@ -263,14 +240,14 @@ class DocType(BuyingController): self.doc.against_expense_account = ",".join(against_accounts) def po_required(self): - if webnotes.conn.get_single_value("Buying Settings", "po_required") == 'Yes': + if webnotes.conn.get_value("Buying Settings", None, "po_required") == 'Yes': for d in getlist(self.doclist,'entries'): if not d.purchase_order: msgprint("Purchse Order No. required against item %s"%d.item_code) raise Exception def pr_required(self): - if webnotes.conn.get_single_value("Buying Settings", "pr_required") == 'Yes': + if webnotes.conn.get_value("Buying Settings", None, "pr_required") == 'Yes': for d in getlist(self.doclist,'entries'): if not d.purchase_receipt: msgprint("Purchase Receipt No. required against item %s"%d.item_code) @@ -466,4 +443,18 @@ class DocType(BuyingController): "UOM Conversion Detail", {"parent": d.item_code, "uom": d.uom}, "conversion_factor")) or 1 - d.rm_supp_cost = rm_cost * flt(d.qty) * flt(d.conversion_factor) \ No newline at end of file + d.rm_supp_cost = rm_cost * flt(d.qty) * flt(d.conversion_factor) + +@webnotes.whitelist() +def get_expense_account(doctype, txt, searchfield, start, page_len, filters): + from controllers.queries import get_match_cond + + return webnotes.conn.sql("""select tabAccount.name from `tabAccount` + where (tabAccount.debit_or_credit="Debit" + or tabAccount.account_type = "Expense Account") + and tabAccount.group_or_ledger="Ledger" + and tabAccount.docstatus!=2 + and tabAccount.company = '%(company)s' + and tabAccount.%(key)s LIKE '%(txt)s' + %(mcond)s""" % {'company': filters['company'], 'key': searchfield, + 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype, searchfield)}) diff --git a/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/accounts/doctype/purchase_invoice/purchase_invoice_list.js index 7b410a3085c..96c06649d59 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice_list.js +++ b/accounts/doctype/purchase_invoice/purchase_invoice_list.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // render wn.listview_settings['Purchase Invoice'] = { add_fields: ["`tabPurchase Invoice`.grand_total", "`tabPurchase Invoice`.outstanding_amount"], diff --git a/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/accounts/doctype/purchase_invoice/test_purchase_invoice.py index bf9f9d9fe6c..c9b5e05c437 100644 --- a/accounts/doctype/purchase_invoice/test_purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/test_purchase_invoice.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py +++ b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py +++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py +++ b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js index 626171cdc8c..423c4e49b9d 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py index 995415e29a9..a4534aefd62 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/sales_invoice/pos.js b/accounts/doctype/sales_invoice/pos.js index 7dc8186d670..5045530aa95 100644 --- a/accounts/doctype/sales_invoice/pos.js +++ b/accounts/doctype/sales_invoice/pos.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + erpnext.POS = Class.extend({ init: function(wrapper, frm) { this.wrapper = wrapper; diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 236231d7bcb..ef3110a2ad7 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.tname = "Sales Invoice Item"; cur_frm.cscript.fname = "entries"; @@ -38,9 +25,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte this.frm.set_df_property("debit_to", "print_hide", 0); } } - // if(this.frm.doc.is_pos && this.frm.doc.docstatus===0) { - // cur_frm.cscript.toggle_pos(true); + // cur_frm.cscript.toggle_pos(true); // } }, diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py index 1dbe09241af..caf7c565c48 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.py +++ b/accounts/doctype/sales_invoice/sales_invoice.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -432,8 +419,8 @@ class DocType(SellingController): def so_dn_required(self): """check in manage account if sales order / delivery note required or not.""" dic = {'Sales Order':'so_required','Delivery Note':'dn_required'} - for i in dic: - if webnotes.conn.get_single_value('Selling Settings', dic[i]) == 'Yes': + for i in dic: + if webnotes.conn.get_value('Selling Settings', None, dic[i]) == 'Yes': for d in getlist(self.doclist,'entries'): if webnotes.conn.get_value('Item', d.item_code, 'is_stock_item') == 'Yes' \ and not d.fields[i.lower().replace(' ','_')]: @@ -960,6 +947,7 @@ def get_bank_cash_account(mode_of_payment): "cash_bank_account": val } +@webnotes.whitelist() def get_income_account(doctype, txt, searchfield, start, page_len, filters): from controllers.queries import get_match_cond diff --git a/accounts/doctype/sales_invoice/sales_invoice_list.js b/accounts/doctype/sales_invoice/sales_invoice_list.js index 5b6230da052..3ebcac9b5bb 100644 --- a/accounts/doctype/sales_invoice/sales_invoice_list.js +++ b/accounts/doctype/sales_invoice/sales_invoice_list.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // render wn.listview_settings['Sales Invoice'] = { add_fields: ["`tabSales Invoice`.grand_total", "`tabSales Invoice`.outstanding_amount"], diff --git a/accounts/doctype/sales_invoice/sales_invoice_map.js b/accounts/doctype/sales_invoice/sales_invoice_map.js index dec4c6fa7dc..81506ea583e 100644 --- a/accounts/doctype/sales_invoice/sales_invoice_map.js +++ b/accounts/doctype/sales_invoice/sales_invoice_map.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.model.map_info["Sales Invoice"] = { "Time Log Batch": { table_map: { diff --git a/accounts/doctype/sales_invoice/test_sales_invoice.py b/accounts/doctype/sales_invoice/test_sales_invoice.py index e5eedb0fb95..ab7482b90da 100644 --- a/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import unittest, json from webnotes.utils import flt, cint diff --git a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py +++ b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.py b/accounts/doctype/sales_invoice_item/sales_invoice_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/sales_invoice_item/sales_invoice_item.py +++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py index 7f48feb2ebf..26d0f769688 100644 --- a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py +++ b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js index df6aaa90fb1..f1a602738bf 100644 --- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js +++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt //--------- ONLOAD ------------- cur_frm.cscript.onload = function(doc, cdt, cdn) { diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py index 27316cae3a9..019edcb31b1 100644 --- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py +++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py b/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py index 9bea271816a..74b0b4edb4f 100644 --- a/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py +++ b/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [ { diff --git a/accounts/doctype/shipping_rule/shipping_rule.js b/accounts/doctype/shipping_rule/shipping_rule.js index 8e8580bedc1..2aeb8ddcd35 100644 --- a/accounts/doctype/shipping_rule/shipping_rule.js +++ b/accounts/doctype/shipping_rule/shipping_rule.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + $.extend(cur_frm.cscript, { onload: function() { erpnext.add_for_territory(); diff --git a/accounts/doctype/shipping_rule/shipping_rule.py b/accounts/doctype/shipping_rule/shipping_rule.py index a363b184543..4eafb01822c 100644 --- a/accounts/doctype/shipping_rule/shipping_rule.py +++ b/accounts/doctype/shipping_rule/shipping_rule.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/accounts/doctype/shipping_rule/test_shipping_rule.py b/accounts/doctype/shipping_rule/test_shipping_rule.py index fe11e2b36f3..f85909e2c01 100644 --- a/accounts/doctype/shipping_rule/test_shipping_rule.py +++ b/accounts/doctype/shipping_rule/test_shipping_rule.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import unittest from accounts.doctype.shipping_rule.shipping_rule import FromGreaterThanToError, ManyBlankToValuesError, OverlappingConditionError diff --git a/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py b/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py index 928aa9ff9f2..784339de7db 100644 --- a/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py +++ b/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/accounts/general_ledger.py b/accounts/general_ledger.py index 8e0f4082bc9..c35e31e0db0 100644 --- a/accounts/general_ledger.py +++ b/accounts/general_ledger.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index 18d43ff4966..05989d6b5ec 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // tree of chart of accounts / cost centers // multiple companies diff --git a/accounts/page/accounts_browser/accounts_browser.py b/accounts/page/accounts_browser/accounts_browser.py index 4c4162d3c18..61f4bfc521b 100644 --- a/accounts/page/accounts_browser/accounts_browser.py +++ b/accounts/page/accounts_browser/accounts_browser.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes import webnotes.defaults @@ -7,21 +10,8 @@ from accounts.utils import get_balance_on @webnotes.whitelist() def get_companies(): """get a list of companies based on permission""" - - # check if match permission exists - res = webnotes.conn.sql("""select role, `match` from `tabDocPerm` - where parent='Account' and permlevel=0 and `read`=1""", as_dict=1) - - roles = webnotes.user.get_roles() - match = any((r["match"] for r in res - if r["role"] in roles and r["match"]=="company")) - - # if match == company is specified and companies are specified in user defaults - if match: - return webnotes.defaults.get_user_default_as_list("company") - else: - return [r[0] for r in webnotes.conn.sql("""select name from tabCompany - where docstatus!=2""")] + return [d.name for d in webnotes.get_list("Company", fields=["name"], + order_by="name")] @webnotes.whitelist() def get_children(): diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js index 069eb1792c3..d6c388335f4 100644 --- a/accounts/page/accounts_home/accounts_home.js +++ b/accounts/page/accounts_home/accounts_home.js @@ -1,5 +1,5 @@ -// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -// GNU General Public License. See "license.txt" +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt" wn.module_page["Accounts"] = [ { diff --git a/accounts/page/financial_analytics/financial_analytics.js b/accounts/page/financial_analytics/financial_analytics.js index aac7076519b..13b9067760b 100644 --- a/accounts/page/financial_analytics/financial_analytics.js +++ b/accounts/page/financial_analytics/financial_analytics.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require("app/js/account_tree_grid.js"); diff --git a/accounts/page/financial_statements/financial_statements.js b/accounts/page/financial_statements/financial_statements.js index 0175da7de4e..48931250f2e 100644 --- a/accounts/page/financial_statements/financial_statements.js +++ b/accounts/page/financial_statements/financial_statements.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt erpnext.fs = {} diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index b73d0af01a4..9ffec3a07bc 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.pages['general-ledger'].onload = function(wrapper) { wn.ui.make_app_page({ diff --git a/accounts/page/trial_balance/trial_balance.js b/accounts/page/trial_balance/trial_balance.js index 9c4c50ad204..65212562cb8 100644 --- a/accounts/page/trial_balance/trial_balance.js +++ b/accounts/page/trial_balance/trial_balance.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require("app/js/account_tree_grid.js"); diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.js b/accounts/page/voucher_import_tool/voucher_import_tool.js index 56cd5d74d5b..5a8538e4dc3 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.js +++ b/accounts/page/voucher_import_tool/voucher_import_tool.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.pages['voucher-import-tool'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.py b/accounts/page/voucher_import_tool/voucher_import_tool.py index a3790a8fe16..416cf0e0237 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.py +++ b/accounts/page/voucher_import_tool/voucher_import_tool.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes import _ diff --git a/accounts/report/accounts_payable/accounts_payable.js b/accounts/report/accounts_payable/accounts_payable.js index 05627d41790..2c6c918e57e 100644 --- a/accounts/report/accounts_payable/accounts_payable.js +++ b/accounts/report/accounts_payable/accounts_payable.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Accounts Payable"] = { "filters": [ { diff --git a/accounts/report/accounts_payable/accounts_payable.py b/accounts/report/accounts_payable/accounts_payable.py index f884773cd90..20702fd0a21 100644 --- a/accounts/report/accounts_payable/accounts_payable.py +++ b/accounts/report/accounts_payable/accounts_payable.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes.utils import getdate, nowdate, flt, cstr diff --git a/accounts/report/accounts_receivable/accounts_receivable.js b/accounts/report/accounts_receivable/accounts_receivable.js index 0ed1656ae0b..5f0b1901c31 100644 --- a/accounts/report/accounts_receivable/accounts_receivable.js +++ b/accounts/report/accounts_receivable/accounts_receivable.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Accounts Receivable"] = { "filters": [ { diff --git a/accounts/report/accounts_receivable/accounts_receivable.py b/accounts/report/accounts_receivable/accounts_receivable.py index 4ae3c86f72f..3ae222328c5 100644 --- a/accounts/report/accounts_receivable/accounts_receivable.py +++ b/accounts/report/accounts_receivable/accounts_receivable.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes import msgprint, _ diff --git a/accounts/report/bank_clearance_summary/bank_clearance_summary.js b/accounts/report/bank_clearance_summary/bank_clearance_summary.js index 76adfd31740..8e6d0c04fe4 100644 --- a/accounts/report/bank_clearance_summary/bank_clearance_summary.js +++ b/accounts/report/bank_clearance_summary/bank_clearance_summary.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Bank Clearance Summary"] = { "filters": [ { diff --git a/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/accounts/report/bank_clearance_summary/bank_clearance_summary.py index 49ac1a46c89..0dfbc9492ed 100644 --- a/accounts/report/bank_clearance_summary/bank_clearance_summary.py +++ b/accounts/report/bank_clearance_summary/bank_clearance_summary.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js index 28ac9205a66..bf971a7f972 100644 --- a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js +++ b/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Bank Reconciliation Statement"] = { "filters": [ { diff --git a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py index 1345cd8006f..1b64850f969 100644 --- a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +++ b/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/budget_variance_report/budget_variance_report.js b/accounts/report/budget_variance_report/budget_variance_report.js index 51a583e0a7b..2ed60182681 100644 --- a/accounts/report/budget_variance_report/budget_variance_report.js +++ b/accounts/report/budget_variance_report/budget_variance_report.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Budget Variance Report"] = { "filters": [ { diff --git a/accounts/report/budget_variance_report/budget_variance_report.py b/accounts/report/budget_variance_report/budget_variance_report.py index 835475f7808..158ff3a818e 100644 --- a/accounts/report/budget_variance_report/budget_variance_report.py +++ b/accounts/report/budget_variance_report/budget_variance_report.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/customer_account_head/customer_account_head.py b/accounts/report/customer_account_head/customer_account_head.py index 61f8cb2eec7..255f3485aa6 100644 --- a/accounts/report/customer_account_head/customer_account_head.py +++ b/accounts/report/customer_account_head/customer_account_head.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt index 05983b072d0..9bcfe700d73 100644 --- a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt +++ b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt @@ -2,7 +2,7 @@ { "creation": "2013-07-30 17:28:49", "docstatus": 0, - "modified": "2013-07-30 18:41:28", + "modified": "2013-08-02 12:41:28", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,7 +10,7 @@ "doctype": "Report", "is_standard": "Yes", "name": "__common__", - "query": "select\n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n\t`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n\t`tabDelivery Note`.`posting_date` as \"Date:Date\",\n\t`tabDelivery Note`.`project_name` as \"Project\",\n\t`tabDelivery Note Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabDelivery Note Item`.`qty` - ifnull((select sum(qty) from `tabSales Invoice Item` \n\t where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n\t `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Qty:Float:110\",\n\t(`tabDelivery Note Item`.`amount` - ifnull((select sum(amount) from `tabSales Invoice Item` \n where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Amount:Currency:110\",\n\t`tabDelivery Note Item`.`item_name` as \"Item Name::150\",\n\t`tabDelivery Note Item`.`description` as \"Description::200\"\nfrom `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note`.docstatus = 1 and\n\t`tabDelivery Note`.status != \"Stopped\" and\n `tabDelivery Note`.name = `tabDelivery Note Item`.parent and\n (`tabDelivery Note Item`.qty > ifnull((select sum(qty) from `tabSales Invoice Item` \n where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\norder by `tabDelivery Note`.`name` desc", + "query": "select\n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n\t`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n\t`tabDelivery Note`.`posting_date` as \"Date:Date\",\n\t`tabDelivery Note`.`project_name` as \"Project\",\n\t`tabDelivery Note Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabDelivery Note Item`.`qty` - ifnull((select sum(qty) from `tabSales Invoice Item` \n\t where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n\t `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Qty:Float:110\",\n\t(`tabDelivery Note Item`.`amount` - ifnull((select sum(amount) from `tabSales Invoice Item` \n where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Amount:Currency:110\",\n\t`tabDelivery Note Item`.`item_name` as \"Item Name::150\",\n\t`tabDelivery Note Item`.`description` as \"Description::200\"\nfrom `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note`.docstatus = 1 and\n\t`tabDelivery Note`.`status` != \"Stopped\" and\n `tabDelivery Note`.name = `tabDelivery Note Item`.parent and\n (`tabDelivery Note Item`.qty > ifnull((select sum(qty) from `tabSales Invoice Item` \n where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\norder by `tabDelivery Note`.`name` desc", "ref_doctype": "Sales Invoice", "report_name": "Delivered Items To Be Billed", "report_type": "Query Report" diff --git a/accounts/report/gross_profit/gross_profit.js b/accounts/report/gross_profit/gross_profit.js index aa6be5528fc..aea0b8a4e40 100644 --- a/accounts/report/gross_profit/gross_profit.js +++ b/accounts/report/gross_profit/gross_profit.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Gross Profit"] = { "filters": [ { diff --git a/accounts/report/gross_profit/gross_profit.py b/accounts/report/gross_profit/gross_profit.py index 798c718acea..dcef5b815ab 100644 --- a/accounts/report/gross_profit/gross_profit.py +++ b/accounts/report/gross_profit/gross_profit.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes.utils import flt diff --git a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js index 0805fe500f0..457c9a80009 100644 --- a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js +++ b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Item-wise Purchase Register"] = { "filters": [ { diff --git a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py index 9093d11e2b3..bd0726e37d9 100644 --- a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py +++ b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/item_wise_sales_register/item_wise_sales_register.js b/accounts/report/item_wise_sales_register/item_wise_sales_register.js index 5d2dbd139fe..c131fbde64f 100644 --- a/accounts/report/item_wise_sales_register/item_wise_sales_register.js +++ b/accounts/report/item_wise_sales_register/item_wise_sales_register.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Item-wise Sales Register"] = wn.query_reports["Sales Register"] = { "filters": [ { diff --git a/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/accounts/report/item_wise_sales_register/item_wise_sales_register.py index 14d686353f4..77fb6f25e6d 100644 --- a/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js b/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js index b2b866a5ed7..8d8c7464676 100644 --- a/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js +++ b/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Payment Collection With Ageing"] = { "filters": [ { diff --git a/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.py b/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.py index 12688525c65..41c5f3e18aa 100644 --- a/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.py +++ b/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/payment_made_with_ageing/payment_made_with_ageing.js b/accounts/report/payment_made_with_ageing/payment_made_with_ageing.js index beed7ea0391..7b80bdeaed4 100644 --- a/accounts/report/payment_made_with_ageing/payment_made_with_ageing.js +++ b/accounts/report/payment_made_with_ageing/payment_made_with_ageing.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Payment Made With Ageing"] = { "filters": [ { diff --git a/accounts/report/payment_made_with_ageing/payment_made_with_ageing.py b/accounts/report/payment_made_with_ageing/payment_made_with_ageing.py index e7f13ef1213..8d3618f4dd5 100644 --- a/accounts/report/payment_made_with_ageing/payment_made_with_ageing.py +++ b/accounts/report/payment_made_with_ageing/payment_made_with_ageing.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js index bb18ce4cbe2..5dbc3fe8a2b 100644 --- a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js +++ b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.require("app/js/purchase_trends_filters.js"); wn.query_reports["Purchase Invoice Trends"] = { diff --git a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py index 659cb853982..c0eb8c9dbc8 100644 --- a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py +++ b/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/purchase_register/purchase_register.js b/accounts/report/purchase_register/purchase_register.js index 4fbd2aabe7c..5944b1a0592 100644 --- a/accounts/report/purchase_register/purchase_register.js +++ b/accounts/report/purchase_register/purchase_register.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Purchase Register"] = { "filters": [ { diff --git a/accounts/report/purchase_register/purchase_register.py b/accounts/report/purchase_register/purchase_register.py index 91525fbc4e2..d7bac9d2450 100644 --- a/accounts/report/purchase_register/purchase_register.py +++ b/accounts/report/purchase_register/purchase_register.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/sales_invoice_trends/sales_invoice_trends.js b/accounts/report/sales_invoice_trends/sales_invoice_trends.js index 6f20015d21f..449b6d211c0 100644 --- a/accounts/report/sales_invoice_trends/sales_invoice_trends.js +++ b/accounts/report/sales_invoice_trends/sales_invoice_trends.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.require("app/js/sales_trends_filters.js"); wn.query_reports["Sales Invoice Trends"] = { diff --git a/accounts/report/sales_invoice_trends/sales_invoice_trends.py b/accounts/report/sales_invoice_trends/sales_invoice_trends.py index 9a5eaf2f8dd..121473d0b3e 100644 --- a/accounts/report/sales_invoice_trends/sales_invoice_trends.py +++ b/accounts/report/sales_invoice_trends/sales_invoice_trends.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/sales_register/sales_register.js b/accounts/report/sales_register/sales_register.js index a423f606217..43c841f1325 100644 --- a/accounts/report/sales_register/sales_register.js +++ b/accounts/report/sales_register/sales_register.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Sales Register"] = { "filters": [ { diff --git a/accounts/report/sales_register/sales_register.py b/accounts/report/sales_register/sales_register.py index 0c96684aa32..4025f66f9a1 100644 --- a/accounts/report/sales_register/sales_register.py +++ b/accounts/report/sales_register/sales_register.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/report/supplier_account_head/supplier_account_head.py b/accounts/report/supplier_account_head/supplier_account_head.py index 8b55067a6bc..53796ce17a9 100644 --- a/accounts/report/supplier_account_head/supplier_account_head.py +++ b/accounts/report/supplier_account_head/supplier_account_head.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/accounts/utils.py b/accounts/utils.py index 04f30b870af..41e0a81859b 100644 --- a/accounts/utils.py +++ b/accounts/utils.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals @@ -391,4 +378,4 @@ def get_stock_and_account_difference(warehouse_list=None): if stock_value - account_balance: difference.setdefault(account, (stock_value - account_balance)) - return difference \ No newline at end of file + return difference diff --git a/buying/doctype/buying_settings/buying_settings.py b/buying/doctype/buying_settings/buying_settings.py index b00bcef42f0..36d236fa155 100644 --- a/buying/doctype/buying_settings/buying_settings.py +++ b/buying/doctype/buying_settings/buying_settings.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js index dabfcd9a961..5a473a8b189 100644 --- a/buying/doctype/purchase_common/purchase_common.js +++ b/buying/doctype/purchase_common/purchase_common.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Preset // ------ diff --git a/buying/doctype/purchase_common/purchase_common.py b/buying/doctype/purchase_common/purchase_common.py index d1da2231d70..65bccaad2bb 100644 --- a/buying/doctype/purchase_common/purchase_common.py +++ b/buying/doctype/purchase_common/purchase_common.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/purchase_order/purchase_order.js b/buying/doctype/purchase_order/purchase_order.js index 360170adece..a960046b75c 100644 --- a/buying/doctype/purchase_order/purchase_order.js +++ b/buying/doctype/purchase_order/purchase_order.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.buying"); diff --git a/buying/doctype/purchase_order/purchase_order.py b/buying/doctype/purchase_order/purchase_order.py index af61c69be10..8bdc2d6f575 100644 --- a/buying/doctype/purchase_order/purchase_order.py +++ b/buying/doctype/purchase_order/purchase_order.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/purchase_order/test_purchase_order.py b/buying/doctype/purchase_order/test_purchase_order.py index 75eac9478ff..e160babc59a 100644 --- a/buying/doctype/purchase_order/test_purchase_order.py +++ b/buying/doctype/purchase_order/test_purchase_order.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/buying/doctype/purchase_order_item/purchase_order_item.py b/buying/doctype/purchase_order_item/purchase_order_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/buying/doctype/purchase_order_item/purchase_order_item.py +++ b/buying/doctype/purchase_order_item/purchase_order_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py index 7f48feb2ebf..26d0f769688 100644 --- a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py +++ b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py index 7f48feb2ebf..26d0f769688 100644 --- a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py +++ b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/quality_inspection/quality_inspection.js b/buying/doctype/quality_inspection/quality_inspection.js index 7c9320945b9..0c865a527b3 100644 --- a/buying/doctype/quality_inspection/quality_inspection.js +++ b/buying/doctype/quality_inspection/quality_inspection.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.item_code = function(doc, cdt, cdn) { if (doc.item_code) diff --git a/buying/doctype/quality_inspection/quality_inspection.py b/buying/doctype/quality_inspection/quality_inspection.py index 48a9a7a6f55..19b2d2aabef 100644 --- a/buying/doctype/quality_inspection/quality_inspection.py +++ b/buying/doctype/quality_inspection/quality_inspection.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/quality_inspection_reading/quality_inspection_reading.py b/buying/doctype/quality_inspection_reading/quality_inspection_reading.py index 7f48feb2ebf..26d0f769688 100644 --- a/buying/doctype/quality_inspection_reading/quality_inspection_reading.py +++ b/buying/doctype/quality_inspection_reading/quality_inspection_reading.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/supplier/supplier.js b/buying/doctype/supplier/supplier.js index 2aa9b5e5a5a..75542c82579 100644 --- a/buying/doctype/supplier/supplier.js +++ b/buying/doctype/supplier/supplier.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require('app/setup/doctype/contact_control/contact_control.js'); diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py index d1552f9425a..c646fdbdb54 100644 --- a/buying/doctype/supplier/supplier.py +++ b/buying/doctype/supplier/supplier.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/supplier/test_supplier.py b/buying/doctype/supplier/test_supplier.py index 3ee3419ffa9..8f8e144c607 100644 --- a/buying/doctype/supplier/test_supplier.py +++ b/buying/doctype/supplier/test_supplier.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Supplier", diff --git a/buying/doctype/supplier_quotation/supplier_quotation.js b/buying/doctype/supplier_quotation/supplier_quotation.js index 96d8ec11bad..cd6127d2355 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.js +++ b/buying/doctype/supplier_quotation/supplier_quotation.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // define defaults for purchase common cur_frm.cscript.tname = "Supplier Quotation Item"; diff --git a/buying/doctype/supplier_quotation/supplier_quotation.py b/buying/doctype/supplier_quotation/supplier_quotation.py index 61b8411beb9..8ba0045dace 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.py +++ b/buying/doctype/supplier_quotation/supplier_quotation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/doctype/supplier_quotation/test_supplier_quotation.py b/buying/doctype/supplier_quotation/test_supplier_quotation.py index 0615d6275f3..d6468d58449 100644 --- a/buying/doctype/supplier_quotation/test_supplier_quotation.py +++ b/buying/doctype/supplier_quotation/test_supplier_quotation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.py b/buying/doctype/supplier_quotation_item/supplier_quotation_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.py +++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/page/buying_home/buying_home.js b/buying/page/buying_home/buying_home.js index 1b130e94dab..4a3e0449ba3 100644 --- a/buying/page/buying_home/buying_home.js +++ b/buying/page/buying_home/buying_home.js @@ -1,5 +1,5 @@ -// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -// GNU General Public License. See "license.txt" +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt" wn.module_page["Buying"] = [ { diff --git a/buying/page/purchase_analytics/purchase_analytics.js b/buying/page/purchase_analytics/purchase_analytics.js index 2b869a67251..c163052a6a3 100644 --- a/buying/page/purchase_analytics/purchase_analytics.js +++ b/buying/page/purchase_analytics/purchase_analytics.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.pages['purchase-analytics'].onload = function(wrapper) { wn.ui.make_app_page({ diff --git a/buying/report/purchase_order_trends/purchase_order_trends.js b/buying/report/purchase_order_trends/purchase_order_trends.js index c6373db6c2a..41cb660d2f8 100644 --- a/buying/report/purchase_order_trends/purchase_order_trends.js +++ b/buying/report/purchase_order_trends/purchase_order_trends.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.require("app/js/purchase_trends_filters.js"); wn.query_reports["Purchase Order Trends"] = { diff --git a/buying/report/purchase_order_trends/purchase_order_trends.py b/buying/report/purchase_order_trends/purchase_order_trends.py index 9dc986e456a..3c99e06c303 100644 --- a/buying/report/purchase_order_trends/purchase_order_trends.py +++ b/buying/report/purchase_order_trends/purchase_order_trends.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/buying/utils.py b/buying/utils.py index d7db1d5fa29..29beb292398 100644 --- a/buying/utils.py +++ b/buying/utils.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/controllers/accounts_controller.py b/controllers/accounts_controller.py index d095a236b9e..a536d92b89a 100644 --- a/controllers/accounts_controller.py +++ b/controllers/accounts_controller.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -141,8 +128,9 @@ class AccountsController(TransactionBase): def calculate_taxes_and_totals(self): # validate conversion rate - if not self.doc.currency: - self.doc.currency = get_company_currency(self.doc.company) + company_currency = get_company_currency(self.doc.company) + if not self.doc.currency or self.doc.currency == company_currency: + self.doc.currency = company_currency self.doc.conversion_rate = 1.0 else: validate_conversion_rate(self.doc.currency, self.doc.conversion_rate, diff --git a/controllers/buying_controller.py b/controllers/buying_controller.py index 83cecfe1121..c5f5d08c47f 100644 --- a/controllers/buying_controller.py +++ b/controllers/buying_controller.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/controllers/js/contact_address_common.js b/controllers/js/contact_address_common.js index 0b8ef085eba..82dad0e83e8 100644 --- a/controllers/js/contact_address_common.js +++ b/controllers/js/contact_address_common.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + cur_frm.cscript.onload = function(doc, cdt, cdn) { cur_frm.add_fetch('customer', 'customer_name', 'customer_name'); cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name'); diff --git a/controllers/queries.py b/controllers/queries.py index 462c22d914c..df7b7c528eb 100644 --- a/controllers/queries.py +++ b/controllers/queries.py @@ -1,18 +1,5 @@ - # 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/controllers/selling_controller.py b/controllers/selling_controller.py index 488c7df1095..0a521d9f793 100644 --- a/controllers/selling_controller.py +++ b/controllers/selling_controller.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/controllers/status_updater.py b/controllers/status_updater.py index ac06b2e1681..070f2002764 100644 --- a/controllers/status_updater.py +++ b/controllers/status_updater.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/controllers/stock_controller.py b/controllers/stock_controller.py index 69d396e7eb2..f2e3abfee63 100644 --- a/controllers/stock_controller.py +++ b/controllers/stock_controller.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/controllers/trends.py b/controllers/trends.py index eaaf4d18f49..ffce99397af 100644 --- a/controllers/trends.py +++ b/controllers/trends.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/docs/docs.user.setup.data_import.md b/docs/docs.user.setup.data_import.md index ae2ee4bcae2..b88b705c1db 100644 --- a/docs/docs.user.setup.data_import.md +++ b/docs/docs.user.setup.data_import.md @@ -5,35 +5,70 @@ --- The Data Import Tool is a great way to upload (or edit) bulk data, specially master data, into the system. To start the tool go to: -> Setup > Data > Data Import Tool +To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button: + +![Start Import](img/import-1.png) The tool has two sections, one to download a template and the second to upload the data. -To upload any type of information, select a type from the drop-down. When you select, the system will give you one or more list of templates you can download. So why multiple templates? +(Note: Only those DocTypes are allowed for Import whose Document Type is "Master" or Allow Import property is set.) -In ERPNext, each master or transaction is defined by a “main table” and “child tables”. These child tables are there because some master tables could have multiple value of certain properties. For example, select Item. Here you will see a number of “child” tables linked to the item table. This is because an Item can have multiple prices, taxes and so on! You must import each table separately. In the child table, you must mention the parent of the row in the “parent” column so that ERPNext knows which Item’s price or tax you are trying to set. +### 1. Downloading The Template -### The Template +Data in ERPNext is stored in tables, much like a spreadsheet with columns and rows of data. Each entity in ERPNext can have multiple child tables associated with it too. The child tables are linked to the parent tables and are implemented where are multiple values for any property. For example an Item can have multiple prices, An Invoice has multiple Items and so on. -Here are a few tips to fill your template: +You can import each table separately, or all at a time. In the child table, you must mention the parent of the row in the “parent” column so that ERPNext knows which Item’s price or tax you are trying to set if you are importing separately. -- Don’t change any cells before the row “----Start entering data below this line----”. -- Leave the first column blank. -- Read the explanations of the columns. -- Some columns are mandatory (the 5th row will tell you which ones those are). -- Columns of type “Link” and “Select” will only accept values from a certain set. -- For “Link” type columns, the value must be present in the table it links to. -- For “Select” the options are given on the 6th row. The value must be one of those. -- Dates: A number of standard date formats are accepted. Please make sure, your dates are added in one of those formats. +![Download The Template](img/import-2.png) -### Overwriting +- Click on the table you want to download or "All Tables" +- For bulk editing, you can click on "Download With Data" -ERPNext also allows you to overwrite all / certain columns. If you want to update certain columns, you can download the template with data.Remember to check on the “Overwrite” box before uploading. +### 2. Fill in the Template + +After downloading the template, open it in a spreadsheet application and fill in the data below the column headings. + +![Spreadsheet](img/import-3.png) + +Then export your template or save it as a **Comma Separated Values** (CSV) file. + +![Spreadsheet](img/import-4.png) + +### 3. Upload the .csv File + +Finally attach the .csv file in the section section click on the "Upload and Import" button. + +![Attach and Upload](img/import-5.png) + +Notes: + +- Make sure that if your application allows, use encoding as UTF-8. +- Keep the ID column blank for new records. +- Make sure you keep the modified column as it is for "All Tables". +- "Parent" column is mandatory for child type tables. + +### 4. Uploading All Tables (Main + Child) + +If you select all tables, you will get columns belonging to all the tables in one row separated by `-` columns. + +If you have multiple child rows then you must start a new main item on a new row. See the example: + + Main Table - Child Table + Column 1 Column 2 Column 3 - Column 1 Column 2 Column 3 + v11 v12 v13 c11 c12 c13 + c14 c15 c17 + v21 v22 v23 c21 c22 c23 + +> To see how its done, enter a few records manually using forms and export "All Tables" with "Download with Data" + +### 5. Overwriting + +ERPNext also allows you to overwrite all / certain columns. If you want to update certain columns, you can download the template with data. Remember to check on the “Overwrite” box before uploading. > Note: For child records, if you select Overwrite, it will delete all the child records of that parent. -### Upload Limitations +### 6. Upload Limitations -ERPNext restricts the amount of data you can upload in one file. Though the number may vary based on the type of data. It is usually safe to upload 100-200 rows of a table at one go. If the system will not accept, then you will see an error. +ERPNext restricts the amount of data you can upload in one file. Though the number may vary based on the type of data. It is usually safe to upload around 1000 rows of a table at one go. If the system will not accept, then you will see an error. Why is this? Uploading a lot of data can cause your system to crash, specially if there are other users doing things in parallel. Hence ERPNext restricts the number of “writes” you can process in one request. diff --git a/docs/docs.user.setup.masters.md b/docs/docs.user.setup.masters.md new file mode 100644 index 00000000000..ccbc32d8250 --- /dev/null +++ b/docs/docs.user.setup.masters.md @@ -0,0 +1,11 @@ +--- +{ + "_label": "Setting Up Masters", + "_toc": [ + "docs.user.stock.item", + "docs.user.selling.customer", + "docs.user.buying.supplier" + ] +} +--- +First step is setting up your master data. \ No newline at end of file diff --git a/docs/docs.user.setup.price_list.md b/docs/docs.user.setup.price_list.md new file mode 100644 index 00000000000..c746ee7ccf0 --- /dev/null +++ b/docs/docs.user.setup.price_list.md @@ -0,0 +1,5 @@ +--- +{ + "_label": "Price Lists" +} +--- \ No newline at end of file diff --git a/docs/docs.user.stock.valuation.md b/docs/docs.user.stock.valuation.md new file mode 100644 index 00000000000..8ecf8fd7eb0 --- /dev/null +++ b/docs/docs.user.stock.valuation.md @@ -0,0 +1,27 @@ +--- +{ + "_label": "Item Valuation: FIFO and Moving Average" +} +--- +### How are Items Valued? + +One of the major features of any inventory system is that you can find out the value of any item based on its historic or average price. You can also find the value of all your items for your balance sheet. Why is valuation important? + +- The buying price fluctuates. +- The value changes because of some process (value add). +- The value changes because of decay, loss etc. + +You may encounter these terms, so lets clarify: + +- Rate: Rate at which the transaction takes place. +- Valuation Rate: Rate at which the items value is set for your valuation. + +There are two major ways in which ERPNext values your items. + +- **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first that you bought first. For example, if you buy an Item at price X and then after a few days at price Y. Thus when you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y. + +![FIFO](img/fifo.png) + +- **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be: + +> New Value X2 = (X * Y + X1 * Y1) / (Y + Y1) \ No newline at end of file diff --git a/home/doctype/feed/feed.py b/home/doctype/feed/feed.py index 36e09cacfb8..25abf5798a0 100644 --- a/home/doctype/feed/feed.py +++ b/home/doctype/feed/feed.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/home/page/activity/activity.js b/home/page/activity/activity.js index 137edb83e5d..17e00c9e696 100644 --- a/home/page/activity/activity.js +++ b/home/page/activity/activity.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.pages['activity'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, diff --git a/home/page/activity/activity.py b/home/page/activity/activity.py index 76f2829c177..1f72d7e865f 100644 --- a/home/page/activity/activity.py +++ b/home/page/activity/activity.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index dcdbed97bac..094eeb558e0 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.pages['latest-updates'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, diff --git a/home/page/latest_updates/latest_updates.py b/home/page/latest_updates/latest_updates.py index 4cd25b2c217..4eb208f9521 100644 --- a/home/page/latest_updates/latest_updates.py +++ b/home/page/latest_updates/latest_updates.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes, os, subprocess, tempfile, json, datetime diff --git a/hr/doctype/appraisal/appraisal.js b/hr/doctype/appraisal/appraisal.js index 3ac62b132a8..f94a288fd52 100644 --- a/hr/doctype/appraisal/appraisal.js +++ b/hr/doctype/appraisal/appraisal.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.add_fetch('employee', 'company', 'company'); cur_frm.add_fetch('employee', 'employee_name', 'employee_name'); diff --git a/hr/doctype/appraisal/appraisal.py b/hr/doctype/appraisal/appraisal.py index 8a50d7c7461..91d54b6dd1c 100644 --- a/hr/doctype/appraisal/appraisal.py +++ b/hr/doctype/appraisal/appraisal.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/appraisal_goal/appraisal_goal.py b/hr/doctype/appraisal_goal/appraisal_goal.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/appraisal_goal/appraisal_goal.py +++ b/hr/doctype/appraisal_goal/appraisal_goal.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/appraisal_template/appraisal_template.py b/hr/doctype/appraisal_template/appraisal_template.py index e43f36a886a..ca1bad7744e 100644 --- a/hr/doctype/appraisal_template/appraisal_template.py +++ b/hr/doctype/appraisal_template/appraisal_template.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/appraisal_template_goal/appraisal_template_goal.py b/hr/doctype/appraisal_template_goal/appraisal_template_goal.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/appraisal_template_goal/appraisal_template_goal.py +++ b/hr/doctype/appraisal_template_goal/appraisal_template_goal.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/attendance/attendance.js b/hr/doctype/attendance/attendance.js index d1a66cea901..4f66b07bc91 100644 --- a/hr/doctype/attendance/attendance.js +++ b/hr/doctype/attendance/attendance.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.add_fetch('employee', 'company', 'company'); cur_frm.add_fetch('employee', 'employee_name', 'employee_name'); diff --git a/hr/doctype/attendance/attendance.py b/hr/doctype/attendance/attendance.py index 16e25470b0a..7b82bc524b0 100644 --- a/hr/doctype/attendance/attendance.py +++ b/hr/doctype/attendance/attendance.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/branch/branch.py b/hr/doctype/branch/branch.py index eb3916b0064..2f09fd44f09 100644 --- a/hr/doctype/branch/branch.py +++ b/hr/doctype/branch/branch.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/branch/test_branch.py b/hr/doctype/branch/test_branch.py index dc336440d6c..a51143e815c 100644 --- a/hr/doctype/branch/test_branch.py +++ b/hr/doctype/branch/test_branch.py @@ -1 +1,4 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{"doctype":"Branch", "branch":"_Test Branch"}]] \ No newline at end of file diff --git a/hr/doctype/deduction_type/deduction_type.py b/hr/doctype/deduction_type/deduction_type.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/deduction_type/deduction_type.py +++ b/hr/doctype/deduction_type/deduction_type.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/deduction_type/test_deduction_type.py b/hr/doctype/deduction_type/test_deduction_type.py new file mode 100644 index 00000000000..57cb0bbb09a --- /dev/null +++ b/hr/doctype/deduction_type/test_deduction_type.py @@ -0,0 +1,13 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + +test_records = [ + [{ + "doctype": "Deduction Type", + "deduction_name": "_Test Professional Tax" + }], + [{ + "doctype": "Deduction Type", + "deduction_name": "_Test TDS" + }] +] \ No newline at end of file diff --git a/hr/doctype/department/department.py b/hr/doctype/department/department.py index 6c41e4f0397..8bb44eefc45 100644 --- a/hr/doctype/department/department.py +++ b/hr/doctype/department/department.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/department/test_department.py b/hr/doctype/department/test_department.py index a5ac6c7d37b..102bbc8018c 100644 --- a/hr/doctype/department/test_department.py +++ b/hr/doctype/department/test_department.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_ignore = ["Leave Block List"] test_records = [ diff --git a/hr/doctype/designation/designation.py b/hr/doctype/designation/designation.py index eb3916b0064..2f09fd44f09 100644 --- a/hr/doctype/designation/designation.py +++ b/hr/doctype/designation/designation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/designation/test_designation.py b/hr/doctype/designation/test_designation.py index 913b7ec8714..1eb8f509610 100644 --- a/hr/doctype/designation/test_designation.py +++ b/hr/doctype/designation/test_designation.py @@ -1 +1,4 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{"doctype":"Designation", "designation_name":"_Test Designation"}]] \ No newline at end of file diff --git a/hr/doctype/earning_type/earning_type.py b/hr/doctype/earning_type/earning_type.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/earning_type/earning_type.py +++ b/hr/doctype/earning_type/earning_type.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/earning_type/test_earning_type.py b/hr/doctype/earning_type/test_earning_type.py new file mode 100644 index 00000000000..f22279e4ae3 --- /dev/null +++ b/hr/doctype/earning_type/test_earning_type.py @@ -0,0 +1,15 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + +test_records = [ + [{ + "doctype": "Earning Type", + "earning_name": "_Test Basic Salary", + "taxable": "Yes" + }], + [{ + "doctype": "Earning Type", + "earning_name": "_Test Allowance", + "taxable": "Yes" + }] +] \ No newline at end of file diff --git a/hr/doctype/employee/employee.js b/hr/doctype/employee/employee.js index 5522ff22646..9ee7c618e65 100644 --- a/hr/doctype/employee/employee.js +++ b/hr/doctype/employee/employee.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.hr"); erpnext.hr.EmployeeController = wn.ui.form.Controller.extend({ @@ -43,11 +30,12 @@ erpnext.hr.EmployeeController = wn.ui.form.Controller.extend({ return this.frm.call({ method:"hr.utils.get_leave_approver_list", callback: function(r) { - me.frm.fields_dict.employee_leave_approvers.grid - .get_field("leave_approver").df.options = - $.map(r.message, function(profile) { - return {value: profile, label: wn.user_info(profile).fullname}; - }); + var df = wn.meta.get_docfield("Employee Leave Approver", "leave_approver", + me.frm.doc.name); + df.options = $.map(r.message, function(profile) { + return {value: profile, label: wn.user_info(profile).fullname}; + }); + me.frm.fields_dict.employee_leave_approvers.refresh(); } }); }, diff --git a/hr/doctype/employee/employee.py b/hr/doctype/employee/employee.py index 036980326cf..690bd55b1f1 100644 --- a/hr/doctype/employee/employee.py +++ b/hr/doctype/employee/employee.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -29,13 +16,17 @@ class DocType: self.doclist = doclist def autoname(self): - ret = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'emp_created_by'") - if not ret: - msgprint("Please setup Employee Naming System in Setup > Global Defaults > HR", raise_exception=True) + naming_method = webnotes.conn.get_value("HR Settings", None, "emp_created_by") + if not naming_method: + webnotes.throw(_("Please setup Employee Naming System in Human Resource > HR Settings")) else: - if ret[0][0]=='Naming Series': + if naming_method=='Naming Series': + if not self.doc.naming_series: + webnotes.throw(_("Please select Naming Neries")) self.doc.name = make_autoname(self.doc.naming_series + '.####') - elif ret[0][0]=='Employee Number': + elif naming_method=='Employee Number': + if not self.doc.employee_number: + webnotes.throw(_("Please enter Employee Number")) self.doc.name = self.doc.employee_number self.doc.employee = self.doc.name @@ -47,7 +38,6 @@ class DocType: self.doc.employee = self.doc.name self.validate_date() self.validate_email() - self.validate_name() self.validate_status() self.validate_employee_leave_approver() @@ -149,20 +139,6 @@ class DocType: if self.doc.personal_email and not validate_email_add(self.doc.personal_email): msgprint("Please enter valid Personal Email") raise Exception - - def validate_name(self): - ret = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'emp_created_by'") - - if not ret: - msgprint("To Save Employee, please go to Setup -->Global Defaults. Click on HR and select 'Employee Records to be created by'.") - raise Exception - else: - if ret[0][0]=='Naming Series' and not self.doc.naming_series: - msgprint("Please select Naming Series.") - raise Exception - elif ret[0][0]=='Employee Number' and not self.doc.employee_number: - msgprint("Please enter Employee Number.") - raise Exception def validate_status(self): if self.doc.status == 'Left' and not self.doc.relieving_date: diff --git a/hr/doctype/employee/test_employee.py b/hr/doctype/employee/test_employee.py index ed7ce94635c..4e857960bc1 100644 --- a/hr/doctype/employee/test_employee.py +++ b/hr/doctype/employee/test_employee.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{ "doctype":"Employee", "employee_name": "_Test Employee", diff --git a/hr/doctype/employee_education/employee_education.py b/hr/doctype/employee_education/employee_education.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/employee_education/employee_education.py +++ b/hr/doctype/employee_education/employee_education.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/employee_external_work_history/employee_external_work_history.py b/hr/doctype/employee_external_work_history/employee_external_work_history.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/employee_external_work_history/employee_external_work_history.py +++ b/hr/doctype/employee_external_work_history/employee_external_work_history.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/employee_internal_work_history/employee_internal_work_history.py b/hr/doctype/employee_internal_work_history/employee_internal_work_history.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/employee_internal_work_history/employee_internal_work_history.py +++ b/hr/doctype/employee_internal_work_history/employee_internal_work_history.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/employee_leave_approver/employee_leave_approver.py b/hr/doctype/employee_leave_approver/employee_leave_approver.py index 928aa9ff9f2..784339de7db 100644 --- a/hr/doctype/employee_leave_approver/employee_leave_approver.py +++ b/hr/doctype/employee_leave_approver/employee_leave_approver.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/hr/doctype/employee_leave_approver/employee_leave_approver.txt b/hr/doctype/employee_leave_approver/employee_leave_approver.txt index f175bbdc29e..d51d6a128bd 100644 --- a/hr/doctype/employee_leave_approver/employee_leave_approver.txt +++ b/hr/doctype/employee_leave_approver/employee_leave_approver.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-12 06:56:15", "docstatus": 0, - "modified": "2013-07-10 14:54:08", + "modified": "2013-08-05 14:15:44", "modified_by": "Administrator", "owner": "Administrator" }, @@ -19,7 +19,7 @@ "doctype": "DocField", "fieldname": "leave_approver", "fieldtype": "Select", - "in_list_view": 0, + "in_list_view": 1, "label": "Leave Approver", "name": "__common__", "parent": "Employee Leave Approver", diff --git a/hr/doctype/employment_type/employment_type.py b/hr/doctype/employment_type/employment_type.py index 6c41e4f0397..8bb44eefc45 100644 --- a/hr/doctype/employment_type/employment_type.py +++ b/hr/doctype/employment_type/employment_type.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/employment_type/test_employment_type.py b/hr/doctype/employment_type/test_employment_type.py index 9aedad413e0..0fefde29712 100644 --- a/hr/doctype/employment_type/test_employment_type.py +++ b/hr/doctype/employment_type/test_employment_type.py @@ -1,2 +1,5 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{"doctype":"Employment Type", "employee_type_name": "_Test Employment Type"}]] \ No newline at end of file diff --git a/hr/doctype/expense_claim/expense_claim.js b/hr/doctype/expense_claim/expense_claim.js index 243075db52f..3497702723b 100644 --- a/hr/doctype/expense_claim/expense_claim.js +++ b/hr/doctype/expense_claim/expense_claim.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.hr"); diff --git a/hr/doctype/expense_claim/expense_claim.py b/hr/doctype/expense_claim/expense_claim.py index 9317f87b8c3..869fbccc313 100644 --- a/hr/doctype/expense_claim/expense_claim.py +++ b/hr/doctype/expense_claim/expense_claim.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/expense_claim_detail/expense_claim_detail.py b/hr/doctype/expense_claim_detail/expense_claim_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/expense_claim_detail/expense_claim_detail.py +++ b/hr/doctype/expense_claim_detail/expense_claim_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/expense_claim_type/expense_claim_type.py b/hr/doctype/expense_claim_type/expense_claim_type.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/expense_claim_type/expense_claim_type.py +++ b/hr/doctype/expense_claim_type/expense_claim_type.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/grade/grade.py b/hr/doctype/grade/grade.py index eb3916b0064..2f09fd44f09 100644 --- a/hr/doctype/grade/grade.py +++ b/hr/doctype/grade/grade.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/grade/test_grade.py b/hr/doctype/grade/test_grade.py index 2d6ce794f0e..8ee6c89103b 100644 --- a/hr/doctype/grade/test_grade.py +++ b/hr/doctype/grade/test_grade.py @@ -1 +1,4 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{"doctype":"Grade", "grade_name":"_Test Grade"}]] \ No newline at end of file diff --git a/hr/doctype/holiday/holiday.py b/hr/doctype/holiday/holiday.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/holiday/holiday.py +++ b/hr/doctype/holiday/holiday.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/holiday_list/holiday_list.py b/hr/doctype/holiday_list/holiday_list.py index 02181142078..81d18f336e1 100644 --- a/hr/doctype/holiday_list/holiday_list.py +++ b/hr/doctype/holiday_list/holiday_list.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/holiday_list/test_holiday_list.py b/hr/doctype/holiday_list/test_holiday_list.py index e3a2d829807..c61127ba68a 100644 --- a/hr/doctype/holiday_list/test_holiday_list.py +++ b/hr/doctype/holiday_list/test_holiday_list.py @@ -1,7 +1,11 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{ "doctype": "Holiday List", "holiday_list_name": "_Test Holiday List", - "fiscal_year": "_Test Fiscal Year 2013" + "fiscal_year": "_Test Fiscal Year 2013", + "is_default": 1 }, { "doctype": "Holiday", "parent": "_Test Holiday List", diff --git a/stock/report/delivered_items_to_be_billed/__init__.py b/hr/doctype/hr_settings/__init__.py similarity index 100% rename from stock/report/delivered_items_to_be_billed/__init__.py rename to hr/doctype/hr_settings/__init__.py diff --git a/hr/doctype/hr_settings/hr_settings.py b/hr/doctype/hr_settings/hr_settings.py new file mode 100644 index 00000000000..784339de7db --- /dev/null +++ b/hr/doctype/hr_settings/hr_settings.py @@ -0,0 +1,11 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + +# For license information, please see license.txt + +from __future__ import unicode_literals +import webnotes + +class DocType: + def __init__(self, d, dl): + self.doc, self.doclist = d, dl \ No newline at end of file diff --git a/hr/doctype/hr_settings/hr_settings.txt b/hr/doctype/hr_settings/hr_settings.txt new file mode 100644 index 00000000000..e3694d05727 --- /dev/null +++ b/hr/doctype/hr_settings/hr_settings.txt @@ -0,0 +1,59 @@ +[ + { + "creation": "2013-08-02 13:45:23", + "docstatus": 0, + "modified": "2013-08-02 14:22:26", + "modified_by": "Administrator", + "owner": "Administrator" + }, + { + "doctype": "DocType", + "document_type": "Other", + "icon": "icon-cog", + "issingle": 1, + "module": "HR", + "name": "__common__" + }, + { + "doctype": "DocField", + "name": "__common__", + "parent": "HR Settings", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { + "create": 1, + "doctype": "DocPerm", + "name": "__common__", + "parent": "HR Settings", + "parentfield": "permissions", + "parenttype": "DocType", + "permlevel": 0, + "read": 1, + "role": "System Manager", + "write": 1 + }, + { + "doctype": "DocType", + "name": "HR Settings" + }, + { + "description": "Employee record is created using selected field. ", + "doctype": "DocField", + "fieldname": "emp_created_by", + "fieldtype": "Select", + "label": "Employee Records to be created by", + "options": "Naming Series\nEmployee Number" + }, + { + "description": "If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day", + "doctype": "DocField", + "fieldname": "include_holidays_in_total_working_days", + "fieldtype": "Check", + "label": "Include holidays in Total no. of Working Days" + }, + { + "doctype": "DocPerm" + } +] \ No newline at end of file diff --git a/hr/doctype/job_applicant/get_job_applications.py b/hr/doctype/job_applicant/get_job_applications.py index 0b994c5b81d..9bec43e5e8c 100644 --- a/hr/doctype/job_applicant/get_job_applications.py +++ b/hr/doctype/job_applicant/get_job_applications.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/job_applicant/job_applicant.js b/hr/doctype/job_applicant/job_applicant.js index 220ff186c26..9aff6057641 100644 --- a/hr/doctype/job_applicant/job_applicant.js +++ b/hr/doctype/job_applicant/job_applicant.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // For license information, please see license.txt cur_frm.cscript = { diff --git a/hr/doctype/job_applicant/job_applicant.py b/hr/doctype/job_applicant/job_applicant.py index da722fbff4b..e9b12b0f782 100644 --- a/hr/doctype/job_applicant/job_applicant.py +++ b/hr/doctype/job_applicant/job_applicant.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/hr/doctype/job_opening/job_opening.py b/hr/doctype/job_opening/job_opening.py index 928aa9ff9f2..784339de7db 100644 --- a/hr/doctype/job_opening/job_opening.py +++ b/hr/doctype/job_opening/job_opening.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/hr/doctype/leave_allocation/leave_allocation.js b/hr/doctype/leave_allocation/leave_allocation.js index a567275921e..07213287b43 100755 --- a/hr/doctype/leave_allocation/leave_allocation.js +++ b/hr/doctype/leave_allocation/leave_allocation.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // ****************************************** onload ******************************************************** cur_frm.cscript.onload = function(doc, dt, dn) { diff --git a/hr/doctype/leave_allocation/leave_allocation.py b/hr/doctype/leave_allocation/leave_allocation.py index d2d940f6c91..1c856fa3352 100755 --- a/hr/doctype/leave_allocation/leave_allocation.py +++ b/hr/doctype/leave_allocation/leave_allocation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js index 5d97f95d730..4c7d356c159 100755 --- a/hr/doctype/leave_application/leave_application.js +++ b/hr/doctype/leave_application/leave_application.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.add_fetch('employee','employee_name','employee_name'); @@ -23,7 +10,6 @@ cur_frm.cscript.onload = function(doc, dt, dn) { cur_frm.set_value("status", "Open"); cur_frm.cscript.calculate_total_days(doc, dt, dn); } - cur_frm.set_df_property("leave_approver", "options", ""); return cur_frm.call({ method:"hr.utils.get_leave_approver_list", callback: function(r) { diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py index 7c47d6a09eb..14c8b1f2121 100755 --- a/hr/doctype/leave_application/leave_application.py +++ b/hr/doctype/leave_application/leave_application.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/leave_application/leave_application_calendar.js b/hr/doctype/leave_application/leave_application_calendar.js index 48eb7fad83c..f9da0e5219c 100644 --- a/hr/doctype/leave_application/leave_application_calendar.js +++ b/hr/doctype/leave_application/leave_application_calendar.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.views.calendar["Leave Application"] = { field_map: { "start": "from_date", diff --git a/hr/doctype/leave_application/test_leave_application.py b/hr/doctype/leave_application/test_leave_application.py index 338225c45e7..5888eaee3cc 100644 --- a/hr/doctype/leave_application/test_leave_application.py +++ b/hr/doctype/leave_application/test_leave_application.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import unittest @@ -236,5 +239,15 @@ test_records = [ "fiscal_year": "_Test Fiscal Year 2013", "employee": "_T-Employee-0002", "company": "_Test Company" + }], + [{ + "doctype": "Leave Application", + "leave_type": "_Test Leave Type LWP", + "from_date": "2013-01-15", + "to_date": "2013-01-15", + "posting_date": "2013-01-02", + "fiscal_year": "_Test Fiscal Year 2013", + "employee": "_T-Employee-0001", + "company": "_Test Company", }] ] diff --git a/hr/doctype/leave_block_list/leave_block_list.py b/hr/doctype/leave_block_list/leave_block_list.py index 81269ba27cf..2f37a3f5256 100644 --- a/hr/doctype/leave_block_list/leave_block_list.py +++ b/hr/doctype/leave_block_list/leave_block_list.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/hr/doctype/leave_block_list/test_leave_block_list.py b/hr/doctype/leave_block_list/test_leave_block_list.py index 9df5fcf3d2c..e266cd84d67 100644 --- a/hr/doctype/leave_block_list/test_leave_block_list.py +++ b/hr/doctype/leave_block_list/test_leave_block_list.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import unittest diff --git a/hr/doctype/leave_block_list_allow/leave_block_list_allow.py b/hr/doctype/leave_block_list_allow/leave_block_list_allow.py index 928aa9ff9f2..784339de7db 100644 --- a/hr/doctype/leave_block_list_allow/leave_block_list_allow.py +++ b/hr/doctype/leave_block_list_allow/leave_block_list_allow.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/hr/doctype/leave_block_list_date/leave_block_list_date.py b/hr/doctype/leave_block_list_date/leave_block_list_date.py index 928aa9ff9f2..784339de7db 100644 --- a/hr/doctype/leave_block_list_date/leave_block_list_date.py +++ b/hr/doctype/leave_block_list_date/leave_block_list_date.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/hr/doctype/leave_control_panel/leave_control_panel.js b/hr/doctype/leave_control_panel/leave_control_panel.js index 88ea067c814..a53f031f4c7 100644 --- a/hr/doctype/leave_control_panel/leave_control_panel.js +++ b/hr/doctype/leave_control_panel/leave_control_panel.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.onload = function(doc,dt,dn){ if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()}); diff --git a/hr/doctype/leave_control_panel/leave_control_panel.py b/hr/doctype/leave_control_panel/leave_control_panel.py index e771c5c12e5..30b52ba8898 100644 --- a/hr/doctype/leave_control_panel/leave_control_panel.py +++ b/hr/doctype/leave_control_panel/leave_control_panel.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/leave_type/leave_type.py b/hr/doctype/leave_type/leave_type.py index 6c41e4f0397..8bb44eefc45 100644 --- a/hr/doctype/leave_type/leave_type.py +++ b/hr/doctype/leave_type/leave_type.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/leave_type/test_leave_type.py b/hr/doctype/leave_type/test_leave_type.py index 4d789758a47..ad3f1588778 100644 --- a/hr/doctype/leave_type/test_leave_type.py +++ b/hr/doctype/leave_type/test_leave_type.py @@ -1,6 +1,14 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "leave_type_name": "_Test Leave Type", "doctype": "Leave Type" + }], + [{ + "leave_type_name": "_Test Leave Type LWP", + "doctype": "Leave Type", + "is_lwp": 1 }] ] \ No newline at end of file diff --git a/hr/doctype/salary_manager/salary_manager.js b/hr/doctype/salary_manager/salary_manager.js index eb13e159465..49fdc565c11 100644 --- a/hr/doctype/salary_manager/salary_manager.js +++ b/hr/doctype/salary_manager/salary_manager.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt var display_activity_log = function(msg) { if(!pscript.ss_html) diff --git a/hr/doctype/salary_manager/salary_manager.py b/hr/doctype/salary_manager/salary_manager.py index e9b3dd719ea..0eadca14c42 100644 --- a/hr/doctype/salary_manager/salary_manager.py +++ b/hr/doctype/salary_manager/salary_manager.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -112,26 +99,16 @@ class DocType: if not sql("""select name from `tabSalary Slip` where docstatus!= 2 and employee = %s and month = %s and fiscal_year = %s and company = %s """, (emp[0], self.doc.month, self.doc.fiscal_year, self.doc.company)): - ss = Document('Salary Slip') - ss.fiscal_year = self.doc.fiscal_year - ss.employee = emp[0] - ss.month = self.doc.month - ss.email_check = self.doc.send_email - ss.company = self.doc.company - ss.save(1) - - ss_obj = get_obj('Salary Slip', ss.name, with_children=1) - ss_obj.get_emp_and_leave_details() - ss_obj.calculate_net_pay() - ss_obj.validate() - ss_obj.doc.save() - - for d in getlist(ss_obj.doclist, 'earning_details'): - d.save() - for d in getlist(ss_obj.doclist, 'deduction_details'): - d.save() - - ss_list.append(ss.name) + ss = webnotes.bean({ + "doctype": "Salary Slip", + "fiscal_year": self.doc.fiscal_year, + "employee": emp[0], + "month": self.doc.month, + "email_check": self.doc.send_email, + "company": self.doc.company, + }) + ss.insert() + ss_list.append(ss.doc.name) return self.create_log(ss_list) diff --git a/hr/doctype/salary_manager/test_salary_manager.py b/hr/doctype/salary_manager/test_salary_manager.py index eb990f81b69..04000f06701 100644 --- a/hr/doctype/salary_manager/test_salary_manager.py +++ b/hr/doctype/salary_manager/test_salary_manager.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import unittest diff --git a/hr/doctype/salary_slip/salary_slip.js b/hr/doctype/salary_slip/salary_slip.js index 387b773c232..e44e981e106 100644 --- a/hr/doctype/salary_slip/salary_slip.js +++ b/hr/doctype/salary_slip/salary_slip.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.add_fetch('employee', 'company', 'company'); diff --git a/hr/doctype/salary_slip/salary_slip.py b/hr/doctype/salary_slip/salary_slip.py index 09bd602da1b..4ca1734b537 100644 --- a/hr/doctype/salary_slip/salary_slip.py +++ b/hr/doctype/salary_slip/salary_slip.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -61,7 +48,7 @@ class DocType(TransactionBase): ["bank_name", "bank_ac_no", "esic_card_no", "pf_number"], as_dict=1) if emp: self.doc.bank_name = emp.bank_name - self.doc.bank_ac_no = emp.bank_ac_no + self.doc.bank_account_no = emp.bank_ac_no self.doc.esic_no = emp.esic_card_no self.doc.pf_no = emp.pf_number @@ -72,9 +59,17 @@ class DocType(TransactionBase): self.doc.month = "%02d" % getdate(nowdate()).month m = get_obj('Salary Manager').get_month_details(self.doc.fiscal_year, self.doc.month) + holidays = self.get_holidays_for_employee(m) + if not cint(webnotes.conn.get_value("HR Settings", "HR Settings", + "include_holidays_in_total_working_days")): + m["month_days"] -= len(holidays) + if m["month_days"] < 0: + msgprint(_("Bummer! There are more holidays than working days this month."), + raise_exception=True) + if not lwp: - lwp = self.calculate_lwp(m) + lwp = self.calculate_lwp(holidays, m) self.doc.total_days_in_month = m['month_days'] self.doc.leave_without_pay = lwp payment_days = flt(self.get_payment_days(m)) - flt(lwp) @@ -103,11 +98,8 @@ class DocType(TransactionBase): payment_days = 0 return payment_days - - - - - def calculate_lwp(self, m): + + def get_holidays_for_employee(self, m): holidays = sql("""select t1.holiday_date from `tabHoliday` t1, tabEmployee t2 where t1.parent = t2.holiday_list and t2.name = %s @@ -117,8 +109,13 @@ class DocType(TransactionBase): holidays = sql("""select t1.holiday_date from `tabHoliday` t1, `tabHoliday List` t2 where t1.parent = t2.name and ifnull(t2.is_default, 0) = 1 - and t2.fiscal_year = %s""", self.doc.fiscal_year) + and t2.fiscal_year = %s + and t1.holiday_date between %s and %s""", (self.doc.fiscal_year, + m['month_start_date'], m['month_end_date'])) holidays = [cstr(i[0]) for i in holidays] + return holidays + + def calculate_lwp(self, holidays, m): lwp = 0 for d in range(m['month_days']): dt = add_days(cstr(m['month_start_date']), d) @@ -133,7 +130,7 @@ class DocType(TransactionBase): and %s between from_date and to_date """, (self.doc.employee, dt)) if leave: - lwp = cint(leave[0][1]) and lwp + 0.5 or lwp + 1 + lwp = cint(leave[0][1]) and (lwp + 0.5) or (lwp + 1) return lwp def check_existing(self): @@ -150,17 +147,29 @@ class DocType(TransactionBase): def validate(self): from webnotes.utils import money_in_words self.check_existing() + + if not (len(self.doclist.get({"parentfield": "earning_details"})) or + len(self.doclist.get({"parentfield": "deduction_details"}))): + self.get_emp_and_leave_details() + else: + self.get_leave_details(self.doc.leave_without_pay) + + if not self.doc.net_pay: + self.calculate_net_pay() + company_currency = get_company_currency(self.doc.company) self.doc.total_in_words = money_in_words(self.doc.rounded_total, company_currency) def calculate_earning_total(self): self.doc.gross_pay = flt(self.doc.arrear_amount) + flt(self.doc.leave_encashment_amount) - for d in getlist(self.doclist, 'earning_details'): + for d in self.doclist.get({"parentfield": "earning_details"}): if cint(d.e_depends_on_lwp) == 1: d.e_modified_amount = round(flt(d.e_amount) * flt(self.doc.payment_days) / cint(self.doc.total_days_in_month), 2) elif not self.doc.payment_days: d.e_modified_amount = 0 + else: + d.e_modified_amount = d.e_amount self.doc.gross_pay += flt(d.e_modified_amount) def calculate_ded_total(self): @@ -171,6 +180,8 @@ class DocType(TransactionBase): / cint(self.doc.total_days_in_month), 2) elif not self.doc.payment_days: d.d_modified_amount = 0 + else: + d.d_modified_amount = d.d_amount self.doc.total_deduction += flt(d.d_modified_amount) diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt index 871c6b850b2..641adae9461 100644 --- a/hr/doctype/salary_slip/salary_slip.txt +++ b/hr/doctype/salary_slip/salary_slip.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:15", "docstatus": 0, - "modified": "2013-07-05 14:53:44", + "modified": "2013-08-02 19:23:13", "modified_by": "Administrator", "owner": "Administrator" }, @@ -190,7 +190,7 @@ "doctype": "DocField", "fieldname": "total_days_in_month", "fieldtype": "Data", - "label": "Total days in month", + "label": "Total Working Days In The Month", "oldfieldname": "total_days_in_month", "oldfieldtype": "Int", "read_only": 1, @@ -208,7 +208,7 @@ "doctype": "DocField", "fieldname": "payment_days", "fieldtype": "Float", - "label": "Payment days", + "label": "Payment Days", "oldfieldname": "payment_days", "oldfieldtype": "Float", "read_only": 1, diff --git a/hr/doctype/salary_slip/test_salary_slip.py b/hr/doctype/salary_slip/test_salary_slip.py new file mode 100644 index 00000000000..6bb8c8eea93 --- /dev/null +++ b/hr/doctype/salary_slip/test_salary_slip.py @@ -0,0 +1,88 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + +import webnotes +import unittest + +class TestSalarySlip(unittest.TestCase): + def setUp(self): + webnotes.conn.sql("""delete from `tabLeave Application`""") + webnotes.conn.sql("""delete from `tabSalary Slip`""") + from hr.doctype.leave_application.test_leave_application import test_records as leave_applications + la = webnotes.bean(copy=leave_applications[4]) + la.insert() + la.doc.status = "Approved" + la.submit() + + def tearDown(self): + webnotes.conn.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 0) + + def test_salary_slip_with_holidays_included(self): + webnotes.conn.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 1) + ss = webnotes.bean(copy=test_records[0]) + ss.insert() + self.assertEquals(ss.doc.total_days_in_month, 31) + self.assertEquals(ss.doc.payment_days, 30) + self.assertEquals(ss.doclist[1].e_modified_amount, 14516.13) + self.assertEquals(ss.doclist[2].e_modified_amount, 500) + self.assertEquals(ss.doclist[3].d_modified_amount, 100) + self.assertEquals(ss.doclist[4].d_modified_amount, 48.39) + self.assertEquals(ss.doc.gross_pay, 15016.13) + self.assertEquals(ss.doc.net_pay, 14867.74) + + def test_salary_slip_with_holidays_excluded(self): + ss = webnotes.bean(copy=test_records[0]) + ss.insert() + self.assertEquals(ss.doc.total_days_in_month, 30) + self.assertEquals(ss.doc.payment_days, 29) + self.assertEquals(ss.doclist[1].e_modified_amount, 14500) + self.assertEquals(ss.doclist[2].e_modified_amount, 500) + self.assertEquals(ss.doclist[3].d_modified_amount, 100) + self.assertEquals(ss.doclist[4].d_modified_amount, 48.33) + self.assertEquals(ss.doc.gross_pay, 15000) + self.assertEquals(ss.doc.net_pay, 14851.67) + +test_dependencies = ["Leave Application"] + +test_records = [ + [ + { + "doctype": "Salary Slip", + "employee": "_T-Employee-0001", + "employee_name": "_Test Employee", + "company": "_Test Company", + "fiscal_year": "_Test Fiscal Year 2013", + "month": "01", + "total_days_in_month": 31, + "payment_days": 31 + }, + { + "doctype": "Salary Slip Earning", + "parentfield": "earning_details", + "e_type": "_Test Basic Salary", + "e_amount": 15000, + "e_depends_on_lwp": 1 + }, + { + "doctype": "Salary Slip Earning", + "parentfield": "earning_details", + "e_type": "_Test Allowance", + "e_amount": 500, + "e_depends_on_lwp": 0 + }, + { + "doctype": "Salary Slip Deduction", + "parentfield": "deduction_details", + "d_type": "_Test Professional Tax", + "d_amount": 100, + "d_depends_on_lwp": 0 + }, + { + "doctype": "Salary Slip Deduction", + "parentfield": "deduction_details", + "d_type": "_Test TDS", + "d_amount": 50, + "d_depends_on_lwp": 1 + }, + ] +] \ No newline at end of file diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.py b/hr/doctype/salary_slip_deduction/salary_slip_deduction.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.py +++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.py b/hr/doctype/salary_slip_earning/salary_slip_earning.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/salary_slip_earning/salary_slip_earning.py +++ b/hr/doctype/salary_slip_earning/salary_slip_earning.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/salary_structure/salary_structure.js b/hr/doctype/salary_structure/salary_structure.js index 6b9898822de..81cb63d352d 100644 --- a/hr/doctype/salary_structure/salary_structure.js +++ b/hr/doctype/salary_structure/salary_structure.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.add_fetch('employee', 'company', 'company'); diff --git a/hr/doctype/salary_structure/salary_structure.py b/hr/doctype/salary_structure/salary_structure.py index c7b33e4ae21..e91861d6fdd 100644 --- a/hr/doctype/salary_structure/salary_structure.py +++ b/hr/doctype/salary_structure/salary_structure.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/salary_structure_deduction/salary_structure_deduction.py b/hr/doctype/salary_structure_deduction/salary_structure_deduction.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/salary_structure_deduction/salary_structure_deduction.py +++ b/hr/doctype/salary_structure_deduction/salary_structure_deduction.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/salary_structure_earning/salary_structure_earning.py b/hr/doctype/salary_structure_earning/salary_structure_earning.py index 7f48feb2ebf..26d0f769688 100644 --- a/hr/doctype/salary_structure_earning/salary_structure_earning.py +++ b/hr/doctype/salary_structure_earning/salary_structure_earning.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/doctype/upload_attendance/upload_attendance.js b/hr/doctype/upload_attendance/upload_attendance.js index db97714236f..71e266928db 100644 --- a/hr/doctype/upload_attendance/upload_attendance.js +++ b/hr/doctype/upload_attendance/upload_attendance.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require("public/app/js/utils.js"); diff --git a/hr/doctype/upload_attendance/upload_attendance.py b/hr/doctype/upload_attendance/upload_attendance.py index 54b8e49b091..c1344b90e41 100644 --- a/hr/doctype/upload_attendance/upload_attendance.py +++ b/hr/doctype/upload_attendance/upload_attendance.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/hr/page/hr_home/hr_home.js b/hr/page/hr_home/hr_home.js index 21ec1e1fe98..71ed6895482 100644 --- a/hr/page/hr_home/hr_home.js +++ b/hr/page/hr_home/hr_home.js @@ -1,5 +1,5 @@ -// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -// GNU General Public License. See "license.txt" +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt" wn.module_page["HR"] = [ { @@ -161,6 +161,18 @@ wn.module_page["HR"] = [ }, ] }, + { + title: wn._("Setup"), + icon: "icon-cog", + items: [ + { + "label": wn._("HR Settings"), + "route": "Form/HR Settings", + "doctype":"HR Settings", + "description": "Settings for HR Module" + } + ] + }, { title: wn._("Reports"), right: true, diff --git a/hr/report/employee_birthday/employee_birthday.js b/hr/report/employee_birthday/employee_birthday.js index f2bc9cbe564..3fd849266f1 100644 --- a/hr/report/employee_birthday/employee_birthday.js +++ b/hr/report/employee_birthday/employee_birthday.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Employee Birthday"] = { "filters": [ { diff --git a/hr/report/employee_birthday/employee_birthday.py b/hr/report/employee_birthday/employee_birthday.py index 7268055b728..d40e7d47b65 100644 --- a/hr/report/employee_birthday/employee_birthday.py +++ b/hr/report/employee_birthday/employee_birthday.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/report/employee_leave_balance/employee_leave_balance.js b/hr/report/employee_leave_balance/employee_leave_balance.js index d19b48f4972..1bf252d2a7a 100644 --- a/hr/report/employee_leave_balance/employee_leave_balance.js +++ b/hr/report/employee_leave_balance/employee_leave_balance.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Employee Leave Balance"] = { "filters": [ { diff --git a/hr/report/employee_leave_balance/employee_leave_balance.py b/hr/report/employee_leave_balance/employee_leave_balance.py index 9d859daf238..770df45b711 100644 --- a/hr/report/employee_leave_balance/employee_leave_balance.py +++ b/hr/report/employee_leave_balance/employee_leave_balance.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes.widgets.reportview import execute as runreport diff --git a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js b/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js index 0cc802dc169..678e7af713b 100644 --- a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js +++ b/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Monthly Attendance Sheet"] = { "filters": [ { diff --git a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py b/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py index 42a977025a6..e321c6ffd76 100644 --- a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +++ b/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/report/monthly_salary_register/monthly_salary_register.js b/hr/report/monthly_salary_register/monthly_salary_register.js index 62c9d90a199..eb33d08cd0f 100644 --- a/hr/report/monthly_salary_register/monthly_salary_register.js +++ b/hr/report/monthly_salary_register/monthly_salary_register.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Monthly Salary Register"] = { "filters": [ { diff --git a/hr/report/monthly_salary_register/monthly_salary_register.py b/hr/report/monthly_salary_register/monthly_salary_register.py index cc25dc3e329..13f49a406dc 100644 --- a/hr/report/monthly_salary_register/monthly_salary_register.py +++ b/hr/report/monthly_salary_register/monthly_salary_register.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/hr/utils.py b/hr/utils.py index 0d23a16c44b..ddd39e99f76 100644 --- a/hr/utils.py +++ b/hr/utils.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/install_erpnext.py b/install_erpnext.py index 66138496bb6..341d4c5d71e 100644 --- a/install_erpnext.py +++ b/install_erpnext.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + #!/usr/bin/env python from __future__ import unicode_literals import os, sys diff --git a/manufacturing/doctype/bom/bom.js b/manufacturing/doctype/bom/bom.js index 6f1786f36da..badb108048a 100644 --- a/manufacturing/doctype/bom/bom.js +++ b/manufacturing/doctype/bom/bom.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // On REFRESH cur_frm.cscript.refresh = function(doc,dt,dn){ diff --git a/manufacturing/doctype/bom/bom.py b/manufacturing/doctype/bom/bom.py index 15f59ec0423..7d5dcb82fca 100644 --- a/manufacturing/doctype/bom/bom.py +++ b/manufacturing/doctype/bom/bom.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/bom/test_bom.py b/manufacturing/doctype/bom/test_bom.py index bc99b89059d..d0b394a1f89 100644 --- a/manufacturing/doctype/bom/test_bom.py +++ b/manufacturing/doctype/bom/test_bom.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.py b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.py +++ b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/bom_item/bom_item.py b/manufacturing/doctype/bom_item/bom_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/manufacturing/doctype/bom_item/bom_item.py +++ b/manufacturing/doctype/bom_item/bom_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/bom_operation/bom_operation.py b/manufacturing/doctype/bom_operation/bom_operation.py index 7f48feb2ebf..26d0f769688 100644 --- a/manufacturing/doctype/bom_operation/bom_operation.py +++ b/manufacturing/doctype/bom_operation/bom_operation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js index bad03ac2ae9..8b37f32c3c5 100644 --- a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js +++ b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc) { diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py index e69c48723d3..dae4deadc96 100644 --- a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +++ b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/production_order/production_order.js b/manufacturing/doctype/production_order/production_order.js index bf4fd8ea123..012c27980d7 100644 --- a/manufacturing/doctype/production_order/production_order.js +++ b/manufacturing/doctype/production_order/production_order.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.onload = function(doc, dt, dn) { if (!doc.status) doc.status = 'Draft'; diff --git a/manufacturing/doctype/production_order/production_order.py b/manufacturing/doctype/production_order/production_order.py index 65670a000ce..fa9b32554a2 100644 --- a/manufacturing/doctype/production_order/production_order.py +++ b/manufacturing/doctype/production_order/production_order.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/production_plan_item/production_plan_item.py b/manufacturing/doctype/production_plan_item/production_plan_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/manufacturing/doctype/production_plan_item/production_plan_item.py +++ b/manufacturing/doctype/production_plan_item/production_plan_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py index 7f48feb2ebf..26d0f769688 100644 --- a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py +++ b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.js b/manufacturing/doctype/production_planning_tool/production_planning_tool.js index c18c84efe7a..ebe1a1cf924 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.js +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.onload = function(doc, cdt, cdn) { doc.company = wn.defaults.get_default("company"); diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/manufacturing/doctype/production_planning_tool/production_planning_tool.py index 966fc53f3c3..09c2705b263 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/doctype/workstation/workstation.js b/manufacturing/doctype/workstation/workstation.js index 3cad9447a9b..e8c3c69c7fb 100644 --- a/manufacturing/doctype/workstation/workstation.js +++ b/manufacturing/doctype/workstation/workstation.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/manufacturing/doctype/workstation/workstation.py b/manufacturing/doctype/workstation/workstation.py index 96f694bbd5e..35e2c1f06b2 100644 --- a/manufacturing/doctype/workstation/workstation.py +++ b/manufacturing/doctype/workstation/workstation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/manufacturing/page/manufacturing_home/manufacturing_home.js b/manufacturing/page/manufacturing_home/manufacturing_home.js index 1f6eed33267..b29bbbbeed6 100644 --- a/manufacturing/page/manufacturing_home/manufacturing_home.js +++ b/manufacturing/page/manufacturing_home/manufacturing_home.js @@ -1,5 +1,5 @@ -// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -// GNU General Public License. See "license.txt" +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt" wn.module_page["Manufacturing"] = [ { diff --git a/patches/april_2012/after_sync_cleanup.py b/patches/april_2012/after_sync_cleanup.py index 1856ee9d572..5e93ce1ea4a 100644 --- a/patches/april_2012/after_sync_cleanup.py +++ b/patches/april_2012/after_sync_cleanup.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/delete_about_contact.py b/patches/april_2012/delete_about_contact.py index 4bd10d74005..2655e3c06eb 100644 --- a/patches/april_2012/delete_about_contact.py +++ b/patches/april_2012/delete_about_contact.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/naming_series_patch.py b/patches/april_2012/naming_series_patch.py index 434d1a44ad0..8b086f7b2a1 100644 --- a/patches/april_2012/naming_series_patch.py +++ b/patches/april_2012/naming_series_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/reload_c_form.py b/patches/april_2012/reload_c_form.py index 0b109044e4f..afb8b6acfdd 100644 --- a/patches/april_2012/reload_c_form.py +++ b/patches/april_2012/reload_c_form.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/remove_default_from_rv_detail.py b/patches/april_2012/remove_default_from_rv_detail.py index 9ce5e24e0aa..7716e6ce3e8 100644 --- a/patches/april_2012/remove_default_from_rv_detail.py +++ b/patches/april_2012/remove_default_from_rv_detail.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/repost_stock_for_posting_time.py b/patches/april_2012/repost_stock_for_posting_time.py index d9cbbe5eb0a..0626205f0c2 100644 --- a/patches/april_2012/repost_stock_for_posting_time.py +++ b/patches/april_2012/repost_stock_for_posting_time.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/serial_no_fixes.py b/patches/april_2012/serial_no_fixes.py index be6fbeb1a84..4fef016e0b2 100644 --- a/patches/april_2012/serial_no_fixes.py +++ b/patches/april_2012/serial_no_fixes.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/update_appraisal_permission.py b/patches/april_2012/update_appraisal_permission.py index 68002ba2aeb..1c07822bd26 100644 --- a/patches/april_2012/update_appraisal_permission.py +++ b/patches/april_2012/update_appraisal_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/update_permlevel_in_address.py b/patches/april_2012/update_permlevel_in_address.py index 96d5adcb50b..a4b84de8fee 100644 --- a/patches/april_2012/update_permlevel_in_address.py +++ b/patches/april_2012/update_permlevel_in_address.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2012/update_role_in_address.py b/patches/april_2012/update_role_in_address.py index 788aa7bd490..33fecbea3c7 100644 --- a/patches/april_2012/update_role_in_address.py +++ b/patches/april_2012/update_role_in_address.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/april_2013/p01_update_serial_no_valuation_rate.py b/patches/april_2013/p01_update_serial_no_valuation_rate.py index 2ea0c26a557..bebb956a58f 100644 --- a/patches/april_2013/p01_update_serial_no_valuation_rate.py +++ b/patches/april_2013/p01_update_serial_no_valuation_rate.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from webnotes.utils import cstr from stock.stock_ledger import update_entries_after diff --git a/patches/april_2013/p02_add_country_and_currency.py b/patches/april_2013/p02_add_country_and_currency.py index ae48a4dbc78..41a1e33578c 100644 --- a/patches/april_2013/p02_add_country_and_currency.py +++ b/patches/april_2013/p02_add_country_and_currency.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): if not webnotes.conn.exists("Country", "Aruba"): diff --git a/patches/april_2013/p03_fixes_for_lead_in_quotation.py b/patches/april_2013/p03_fixes_for_lead_in_quotation.py index 1b9650b166d..62134545ce7 100644 --- a/patches/april_2013/p03_fixes_for_lead_in_quotation.py +++ b/patches/april_2013/p03_fixes_for_lead_in_quotation.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.conn.sql("""update `tabQuotation` set customer_name = organization diff --git a/patches/april_2013/p04_reverse_modules_list.py b/patches/april_2013/p04_reverse_modules_list.py index 1751d36ca2a..4652fbab3e6 100644 --- a/patches/april_2013/p04_reverse_modules_list.py +++ b/patches/april_2013/p04_reverse_modules_list.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, json import webnotes.utils diff --git a/patches/april_2013/p04_update_role_in_pages.py b/patches/april_2013/p04_update_role_in_pages.py index 39590448767..1f89d81bd5a 100644 --- a/patches/april_2013/p04_update_role_in_pages.py +++ b/patches/april_2013/p04_update_role_in_pages.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import webnotes.model def execute(): diff --git a/patches/april_2013/p05_fixes_in_reverse_modules.py b/patches/april_2013/p05_fixes_in_reverse_modules.py index 41e2e5ef2f9..c5a6974c900 100644 --- a/patches/april_2013/p05_fixes_in_reverse_modules.py +++ b/patches/april_2013/p05_fixes_in_reverse_modules.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, json import webnotes.utils diff --git a/patches/april_2013/p05_update_file_data.py b/patches/april_2013/p05_update_file_data.py index 0168de63f15..e03abc6b65c 100644 --- a/patches/april_2013/p05_update_file_data.py +++ b/patches/april_2013/p05_update_file_data.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, webnotes.utils, os def execute(): diff --git a/patches/april_2013/p06_default_cost_center.py b/patches/april_2013/p06_default_cost_center.py index 4aaa7d53b3e..144903472fa 100644 --- a/patches/april_2013/p06_default_cost_center.py +++ b/patches/april_2013/p06_default_cost_center.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/april_2013/p06_update_file_size.py b/patches/april_2013/p06_update_file_size.py index 760c3cb0449..6879625ad9d 100644 --- a/patches/april_2013/p06_update_file_size.py +++ b/patches/april_2013/p06_update_file_size.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, os, webnotes.utils def execute(): diff --git a/patches/april_2013/p07_rename_cost_center_other_charges.py b/patches/april_2013/p07_rename_cost_center_other_charges.py index c3c94912cf4..ea5168f3e2e 100644 --- a/patches/april_2013/p07_rename_cost_center_other_charges.py +++ b/patches/april_2013/p07_rename_cost_center_other_charges.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/april_2013/p07_update_file_data_2.py b/patches/april_2013/p07_update_file_data_2.py index 548ba6cdc4e..fad612ec2de 100644 --- a/patches/april_2013/p07_update_file_data_2.py +++ b/patches/april_2013/p07_update_file_data_2.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): from patches.april_2013.p05_update_file_data import update_file_list, get_single_doctypes diff --git a/patches/april_2013/rebuild_sales_browser.py b/patches/april_2013/rebuild_sales_browser.py index 917ae684674..867ac3593ed 100644 --- a/patches/april_2013/rebuild_sales_browser.py +++ b/patches/april_2013/rebuild_sales_browser.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): from patches.january_2013 import rebuild_tree diff --git a/patches/august_2012/change_profile_permission.py b/patches/august_2012/change_profile_permission.py index 7e945d5d9aa..5944c03148a 100644 --- a/patches/august_2012/change_profile_permission.py +++ b/patches/august_2012/change_profile_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/august_2012/repost_billed_amt.py b/patches/august_2012/repost_billed_amt.py index 4ff7afb2e93..b545c2e621c 100644 --- a/patches/august_2012/repost_billed_amt.py +++ b/patches/august_2012/repost_billed_amt.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/august_2012/task_allocated_to_assigned.py b/patches/august_2012/task_allocated_to_assigned.py index 8485939eec0..5d736bf8722 100644 --- a/patches/august_2012/task_allocated_to_assigned.py +++ b/patches/august_2012/task_allocated_to_assigned.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/patches/august_2013/__init__.py b/patches/august_2013/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/patches/august_2013/p01_hr_settings.py b/patches/august_2013/p01_hr_settings.py new file mode 100644 index 00000000000..302611bb6f2 --- /dev/null +++ b/patches/august_2013/p01_hr_settings.py @@ -0,0 +1,19 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + +import webnotes + +def execute(): + webnotes.reload_doc("hr", "doctype", "hr_settings") + webnotes.reload_doc("setup", "doctype", "global_defaults") + + hr = webnotes.bean("HR Settings", "HR Settings") + hr.doc.emp_created_by = webnotes.conn.get_value("Global Defaults", "Global Defaults", "emp_created_by") + + if webnotes.conn.sql("""select name from `tabSalary Slip` where docstatus=1 limit 1"""): + hr.doc.include_holidays_in_total_working_days = 1 + + hr.save() + + webnotes.conn.sql("""delete from `tabSingles` where doctype = 'Global Defaults' + and field = 'emp_created_by'""") \ No newline at end of file diff --git a/patches/december_2012/address_title.py b/patches/december_2012/address_title.py index fe681548676..fc7d2baed1b 100644 --- a/patches/december_2012/address_title.py +++ b/patches/december_2012/address_title.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/december_2012/delete_form16_print_format.py b/patches/december_2012/delete_form16_print_format.py index 4234d65f589..e9171125b9a 100644 --- a/patches/december_2012/delete_form16_print_format.py +++ b/patches/december_2012/delete_form16_print_format.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.delete_doc("Print Format", "Form 16A Print Format") \ No newline at end of file diff --git a/patches/december_2012/deleted_contact_address_patch.py b/patches/december_2012/deleted_contact_address_patch.py index 3eb1b37eee4..4143062d083 100644 --- a/patches/december_2012/deleted_contact_address_patch.py +++ b/patches/december_2012/deleted_contact_address_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): """finds references of deleted addresses and contacts and deletes these references""" diff --git a/patches/december_2012/deprecate_tds.py b/patches/december_2012/deprecate_tds.py index 09b378ca589..70ccf6d86b5 100644 --- a/patches/december_2012/deprecate_tds.py +++ b/patches/december_2012/deprecate_tds.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes from webnotes.model import delete_doc diff --git a/patches/december_2012/expense_leave_reload.py b/patches/december_2012/expense_leave_reload.py index 867a7956c6e..3a97be7af19 100644 --- a/patches/december_2012/expense_leave_reload.py +++ b/patches/december_2012/expense_leave_reload.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/december_2012/file_list_rename.py b/patches/december_2012/file_list_rename.py index 52657ac2d65..ce4ae76a46f 100644 --- a/patches/december_2012/file_list_rename.py +++ b/patches/december_2012/file_list_rename.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/december_2012/fix_default_print_format.py b/patches/december_2012/fix_default_print_format.py index e4751225d9b..df245e29c26 100644 --- a/patches/december_2012/fix_default_print_format.py +++ b/patches/december_2012/fix_default_print_format.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.conn.sql("""update `tabDocType` set default_print_format=null diff --git a/patches/december_2012/move_recent_to_memcache.py b/patches/december_2012/move_recent_to_memcache.py index c92c487fd06..f720ad25fe2 100644 --- a/patches/december_2012/move_recent_to_memcache.py +++ b/patches/december_2012/move_recent_to_memcache.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes, json diff --git a/patches/december_2012/production_cleanup.py b/patches/december_2012/production_cleanup.py index 5880448c599..53cce626bd4 100644 --- a/patches/december_2012/production_cleanup.py +++ b/patches/december_2012/production_cleanup.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/december_2012/production_order_naming_series.py b/patches/december_2012/production_order_naming_series.py index df011cb731d..a175367f159 100644 --- a/patches/december_2012/production_order_naming_series.py +++ b/patches/december_2012/production_order_naming_series.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/december_2012/rebuild_item_group_tree.py b/patches/december_2012/rebuild_item_group_tree.py index 1dfac389439..1fd2801fc36 100644 --- a/patches/december_2012/rebuild_item_group_tree.py +++ b/patches/december_2012/rebuild_item_group_tree.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/december_2012/remove_quotation_next_contact.py b/patches/december_2012/remove_quotation_next_contact.py index d7e0dc761df..da204494d45 100644 --- a/patches/december_2012/remove_quotation_next_contact.py +++ b/patches/december_2012/remove_quotation_next_contact.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/patches/december_2012/replace_createlocal.py b/patches/december_2012/replace_createlocal.py index c6f4bae4ae2..0054e59fdea 100644 --- a/patches/december_2012/replace_createlocal.py +++ b/patches/december_2012/replace_createlocal.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.conn.sql("""update `tabCustom Script` diff --git a/patches/december_2012/repost_ordered_qty.py b/patches/december_2012/repost_ordered_qty.py index 4b046f18388..2e3c690adfb 100644 --- a/patches/december_2012/repost_ordered_qty.py +++ b/patches/december_2012/repost_ordered_qty.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes from webnotes.utils import flt diff --git a/patches/december_2012/repost_projected_qty.py b/patches/december_2012/repost_projected_qty.py index 4e4f5227137..d4cf4754e81 100644 --- a/patches/december_2012/repost_projected_qty.py +++ b/patches/december_2012/repost_projected_qty.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.conn.sql("""update `tabBin` diff --git a/patches/december_2012/stock_entry_cleanup.py b/patches/december_2012/stock_entry_cleanup.py index 728e80ae415..bd8beb34aed 100644 --- a/patches/december_2012/stock_entry_cleanup.py +++ b/patches/december_2012/stock_entry_cleanup.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): # removed following fields diff --git a/patches/december_2012/update_print_width.py b/patches/december_2012/update_print_width.py index a808d952fc6..f5a05e4d1fd 100644 --- a/patches/december_2012/update_print_width.py +++ b/patches/december_2012/update_print_width.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/december_2012/website_cache_refactor.py b/patches/december_2012/website_cache_refactor.py index 3c157bd7144..33f10e1a17b 100644 --- a/patches/december_2012/website_cache_refactor.py +++ b/patches/december_2012/website_cache_refactor.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/patches/february_2013/account_negative_balance.py b/patches/february_2013/account_negative_balance.py index a57b01ed5e8..58ca862f80a 100644 --- a/patches/february_2013/account_negative_balance.py +++ b/patches/february_2013/account_negative_balance.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.reload_doc("accounts", "doctype", "account") diff --git a/patches/february_2013/fix_outstanding.py b/patches/february_2013/fix_outstanding.py index 8afc63f5110..d3f6390d6db 100644 --- a/patches/february_2013/fix_outstanding.py +++ b/patches/february_2013/fix_outstanding.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes from webnotes.utils import flt diff --git a/patches/february_2013/gle_floating_point_issue_revisited.py b/patches/february_2013/gle_floating_point_issue_revisited.py index e407d5080ea..a979dadf717 100644 --- a/patches/february_2013/gle_floating_point_issue_revisited.py +++ b/patches/february_2013/gle_floating_point_issue_revisited.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes from webnotes.utils import flt diff --git a/patches/february_2013/p01_event.py b/patches/february_2013/p01_event.py index e6b04d3cc6a..2b26e7aef69 100644 --- a/patches/february_2013/p01_event.py +++ b/patches/february_2013/p01_event.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/february_2013/p02_email_digest.py b/patches/february_2013/p02_email_digest.py index 375387408f4..271804cfa67 100644 --- a/patches/february_2013/p02_email_digest.py +++ b/patches/february_2013/p02_email_digest.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.reload_doc("setup", "doctype", "email_digest") diff --git a/patches/february_2013/p03_material_request.py b/patches/february_2013/p03_material_request.py index d85710d2a89..0b6f3031314 100644 --- a/patches/february_2013/p03_material_request.py +++ b/patches/february_2013/p03_material_request.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, os, sys def execute(): diff --git a/patches/february_2013/p04_remove_old_doctypes.py b/patches/february_2013/p04_remove_old_doctypes.py index 7e7ebf519b8..3b0d0ad6968 100644 --- a/patches/february_2013/p04_remove_old_doctypes.py +++ b/patches/february_2013/p04_remove_old_doctypes.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, os def execute(): diff --git a/patches/february_2013/p05_leave_application.py b/patches/february_2013/p05_leave_application.py index 88d166e6132..0de510a367a 100644 --- a/patches/february_2013/p05_leave_application.py +++ b/patches/february_2013/p05_leave_application.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/february_2013/p08_todo_query_report.py b/patches/february_2013/p08_todo_query_report.py index 6b25aba9cab..7437c548662 100644 --- a/patches/february_2013/p08_todo_query_report.py +++ b/patches/february_2013/p08_todo_query_report.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/february_2013/p09_remove_cancelled_warehouses.py b/patches/february_2013/p09_remove_cancelled_warehouses.py index 05e569ab72a..e034c6513cb 100644 --- a/patches/february_2013/p09_remove_cancelled_warehouses.py +++ b/patches/february_2013/p09_remove_cancelled_warehouses.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/february_2013/p09_timesheets.py b/patches/february_2013/p09_timesheets.py index 609dba33bcd..ac6d44c6283 100644 --- a/patches/february_2013/p09_timesheets.py +++ b/patches/february_2013/p09_timesheets.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/february_2013/payment_reconciliation_reset_values.py b/patches/february_2013/payment_reconciliation_reset_values.py index cdb213a605e..f7923908f9f 100644 --- a/patches/february_2013/payment_reconciliation_reset_values.py +++ b/patches/february_2013/payment_reconciliation_reset_values.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.conn.sql("""update `tabSingles` set value = '' diff --git a/patches/february_2013/reload_bom_replace_tool_permission.py b/patches/february_2013/reload_bom_replace_tool_permission.py index fca032e4d3c..82fea956ec4 100644 --- a/patches/february_2013/reload_bom_replace_tool_permission.py +++ b/patches/february_2013/reload_bom_replace_tool_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.conn.sql("""delete from `tabDocPerm` where parent = 'BOM Replace Tool'""") diff --git a/patches/february_2013/remove_account_utils_folder.py b/patches/february_2013/remove_account_utils_folder.py index 5d0313bbfbb..4f40ae975a7 100644 --- a/patches/february_2013/remove_account_utils_folder.py +++ b/patches/february_2013/remove_account_utils_folder.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): from webnotes.utils import get_base_path import shutil diff --git a/patches/february_2013/remove_gl_mapper.py b/patches/february_2013/remove_gl_mapper.py index 7d248d3761c..05e2ed51975 100644 --- a/patches/february_2013/remove_gl_mapper.py +++ b/patches/february_2013/remove_gl_mapper.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes try: diff --git a/patches/february_2013/repost_reserved_qty.py b/patches/february_2013/repost_reserved_qty.py index 7d790da2df9..3a3353f9182 100644 --- a/patches/february_2013/repost_reserved_qty.py +++ b/patches/february_2013/repost_reserved_qty.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.conn.auto_commit_on_many_writes = 1 diff --git a/patches/february_2013/update_company_in_leave_application.py b/patches/february_2013/update_company_in_leave_application.py index be07cb8f355..96f3bb79f8a 100644 --- a/patches/february_2013/update_company_in_leave_application.py +++ b/patches/february_2013/update_company_in_leave_application.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.reload_doc("hr", "doctype", "leave_application") diff --git a/patches/january_2013/change_patch_structure.py b/patches/january_2013/change_patch_structure.py index 1370cdddcd1..112d6942723 100644 --- a/patches/january_2013/change_patch_structure.py +++ b/patches/january_2013/change_patch_structure.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/january_2013/enable_currencies.py b/patches/january_2013/enable_currencies.py index ed9860f5dec..9dfe6b4a022 100644 --- a/patches/january_2013/enable_currencies.py +++ b/patches/january_2013/enable_currencies.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/january_2013/file_list_rename_returns.py b/patches/january_2013/file_list_rename_returns.py index f897d5c4ece..2325da52795 100644 --- a/patches/january_2013/file_list_rename_returns.py +++ b/patches/january_2013/file_list_rename_returns.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from webnotes.utils import get_base_path import os diff --git a/patches/january_2013/give_report_permission_on_read.py b/patches/january_2013/give_report_permission_on_read.py index d9496fb1561..2e67a771f71 100644 --- a/patches/january_2013/give_report_permission_on_read.py +++ b/patches/january_2013/give_report_permission_on_read.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.conn.sql("""update tabDocPerm set `report`=`read` diff --git a/patches/january_2013/holiday_list_patch.py b/patches/january_2013/holiday_list_patch.py index 714c0e89636..f7f6360a3ac 100644 --- a/patches/january_2013/holiday_list_patch.py +++ b/patches/january_2013/holiday_list_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): for name in webnotes.conn.sql("""select name from `tabHoliday List`"""): diff --git a/patches/january_2013/purchase_price_list.py b/patches/january_2013/purchase_price_list.py index 419e709fb2c..89509cf0874 100644 --- a/patches/january_2013/purchase_price_list.py +++ b/patches/january_2013/purchase_price_list.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/january_2013/rebuild_tree.py b/patches/january_2013/rebuild_tree.py index 75520902583..4cc311862ff 100644 --- a/patches/january_2013/rebuild_tree.py +++ b/patches/january_2013/rebuild_tree.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): from webnotes.utils.nestedset import rebuild_tree diff --git a/patches/january_2013/reload_print_format.py b/patches/january_2013/reload_print_format.py index f757dcf137d..c468b4887b6 100644 --- a/patches/january_2013/reload_print_format.py +++ b/patches/january_2013/reload_print_format.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): from webnotes.modules.import_file import import_files import_files([["selling", "Print Format", "Quotation Classic"], diff --git a/patches/january_2013/remove_bad_permissions.py b/patches/january_2013/remove_bad_permissions.py index 58d5de27d48..01de1017b62 100644 --- a/patches/january_2013/remove_bad_permissions.py +++ b/patches/january_2013/remove_bad_permissions.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/january_2013/remove_landed_cost_master.py b/patches/january_2013/remove_landed_cost_master.py index 01eefb46c7a..d4bff86f81b 100644 --- a/patches/january_2013/remove_landed_cost_master.py +++ b/patches/january_2013/remove_landed_cost_master.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.delete_doc("DocType", "Landed Cost Master") diff --git a/patches/january_2013/remove_tds_entry_from_gl_mapper.py b/patches/january_2013/remove_tds_entry_from_gl_mapper.py index dcdfe0c0fc0..f058ebc4b1f 100644 --- a/patches/january_2013/remove_tds_entry_from_gl_mapper.py +++ b/patches/january_2013/remove_tds_entry_from_gl_mapper.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): return from webnotes.modules.import_file import import_file diff --git a/patches/january_2013/remove_unwanted_permission.py b/patches/january_2013/remove_unwanted_permission.py index 7053d9fd1aa..48b1bab683c 100644 --- a/patches/january_2013/remove_unwanted_permission.py +++ b/patches/january_2013/remove_unwanted_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes for dt in webnotes.conn.sql("""select name, issingle from tabDocType"""): diff --git a/patches/january_2013/report_permission.py b/patches/january_2013/report_permission.py index 8f90e87d86b..9b3bdd28552 100644 --- a/patches/january_2013/report_permission.py +++ b/patches/january_2013/report_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.reload_doc("core", "doctype", "docperm") diff --git a/patches/january_2013/stock_reconciliation_patch.py b/patches/january_2013/stock_reconciliation_patch.py index 9a25ffd94a9..8ffbc4f5d49 100644 --- a/patches/january_2013/stock_reconciliation_patch.py +++ b/patches/january_2013/stock_reconciliation_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/january_2013/tabsessions_to_myisam.py b/patches/january_2013/tabsessions_to_myisam.py index 23d55629083..8d303ff7bb8 100644 --- a/patches/january_2013/tabsessions_to_myisam.py +++ b/patches/january_2013/tabsessions_to_myisam.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.conn.commit() diff --git a/patches/january_2013/update_closed_on.py b/patches/january_2013/update_closed_on.py index 138549a1fef..94122d7347e 100644 --- a/patches/january_2013/update_closed_on.py +++ b/patches/january_2013/update_closed_on.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/january_2013/update_country_info.py b/patches/january_2013/update_country_info.py index d0619f34d67..398887b5920 100644 --- a/patches/january_2013/update_country_info.py +++ b/patches/january_2013/update_country_info.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/patches/january_2013/update_fraction_for_usd.py b/patches/january_2013/update_fraction_for_usd.py index f90f8658819..0780ce912e7 100644 --- a/patches/january_2013/update_fraction_for_usd.py +++ b/patches/january_2013/update_fraction_for_usd.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.conn.sql("""update `tabCurrency` set fraction = 'Cent' where fraction = 'Cent[D]'""") \ No newline at end of file diff --git a/patches/january_2013/update_number_format.py b/patches/january_2013/update_number_format.py index 96284a6f792..e4e0ad6dbc1 100644 --- a/patches/january_2013/update_number_format.py +++ b/patches/january_2013/update_number_format.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/patches/july_2012/address_contact_perms.py b/patches/july_2012/address_contact_perms.py index 882cf728a53..8c41dbc8e8b 100644 --- a/patches/july_2012/address_contact_perms.py +++ b/patches/july_2012/address_contact_perms.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/july_2012/auth_table.py b/patches/july_2012/auth_table.py index 9700495fd33..718243d6de2 100644 --- a/patches/july_2012/auth_table.py +++ b/patches/july_2012/auth_table.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes def execute(): diff --git a/patches/july_2012/bin_permission.py b/patches/july_2012/bin_permission.py index d48460cd94e..3f9b65cd93f 100644 --- a/patches/july_2012/bin_permission.py +++ b/patches/july_2012/bin_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/july_2012/default_freeze_account.py b/patches/july_2012/default_freeze_account.py index ddc025c72db..5255aa0df83 100644 --- a/patches/july_2012/default_freeze_account.py +++ b/patches/july_2012/default_freeze_account.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/july_2012/deprecate_bulk_rename.py b/patches/july_2012/deprecate_bulk_rename.py index 06f1a211592..5cb25a75e06 100644 --- a/patches/july_2012/deprecate_bulk_rename.py +++ b/patches/july_2012/deprecate_bulk_rename.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/july_2012/deprecate_import_data_control.py b/patches/july_2012/deprecate_import_data_control.py index d0a92a0d627..f060587ccc5 100644 --- a/patches/july_2012/deprecate_import_data_control.py +++ b/patches/july_2012/deprecate_import_data_control.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """ diff --git a/patches/july_2012/packing_list_cleanup_and_serial_no.py b/patches/july_2012/packing_list_cleanup_and_serial_no.py index e65ae99b24d..ad3863e066b 100644 --- a/patches/july_2012/packing_list_cleanup_and_serial_no.py +++ b/patches/july_2012/packing_list_cleanup_and_serial_no.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/july_2012/project_patch_repeat.py b/patches/july_2012/project_patch_repeat.py index b1386614c4c..c17e9c448b7 100644 --- a/patches/july_2012/project_patch_repeat.py +++ b/patches/july_2012/project_patch_repeat.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/july_2012/remove_event_role_owner_match.py b/patches/july_2012/remove_event_role_owner_match.py index 21ee2246725..cd5f489036e 100644 --- a/patches/july_2012/remove_event_role_owner_match.py +++ b/patches/july_2012/remove_event_role_owner_match.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/july_2012/repost_stock_due_to_wrong_packing_list.py b/patches/july_2012/repost_stock_due_to_wrong_packing_list.py index 615d7ed6105..315b4edd207 100644 --- a/patches/july_2012/repost_stock_due_to_wrong_packing_list.py +++ b/patches/july_2012/repost_stock_due_to_wrong_packing_list.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from stock.stock_ledger import update_entries_after diff --git a/patches/july_2012/unicode_conf.py b/patches/july_2012/unicode_conf.py index 24ceed4209f..cbbe5daeb18 100644 --- a/patches/july_2012/unicode_conf.py +++ b/patches/july_2012/unicode_conf.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): diff --git a/patches/july_2012/update_purchase_tax.py b/patches/july_2012/update_purchase_tax.py index 3f785e5e708..28f2ca7d8c3 100644 --- a/patches/july_2012/update_purchase_tax.py +++ b/patches/july_2012/update_purchase_tax.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/july_2013/p01_remove_doctype_mappers.py b/patches/july_2013/p01_remove_doctype_mappers.py index 8aa69b82b48..b914b1b5420 100644 --- a/patches/july_2013/p01_remove_doctype_mappers.py +++ b/patches/july_2013/p01_remove_doctype_mappers.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.conn.sql("""drop table if exists `tabDocType Mapper`""") diff --git a/patches/july_2013/p01_same_sales_rate_patch.py b/patches/july_2013/p01_same_sales_rate_patch.py index 82ec1dbd150..ce5b1f88c1b 100644 --- a/patches/july_2013/p01_same_sales_rate_patch.py +++ b/patches/july_2013/p01_same_sales_rate_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.reload_doc("setup", "doctype", "global_defaults") diff --git a/patches/july_2013/p02_copy_shipping_address.py b/patches/july_2013/p02_copy_shipping_address.py index c73f93db2ab..2fa195f1370 100644 --- a/patches/july_2013/p02_copy_shipping_address.py +++ b/patches/july_2013/p02_copy_shipping_address.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.reload_doc("stock", "doctype", "delivery_note") diff --git a/patches/july_2013/p03_cost_center_company.py b/patches/july_2013/p03_cost_center_company.py index 22072ae4685..5cd44b7bd7f 100644 --- a/patches/july_2013/p03_cost_center_company.py +++ b/patches/july_2013/p03_cost_center_company.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/july_2013/p04_merge_duplicate_leads.py b/patches/july_2013/p04_merge_duplicate_leads.py index d4e56f6529b..de375486fab 100644 --- a/patches/july_2013/p04_merge_duplicate_leads.py +++ b/patches/july_2013/p04_merge_duplicate_leads.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from webnotes.utils import extract_email_id diff --git a/patches/july_2013/p05_custom_doctypes_in_list_view.py b/patches/july_2013/p05_custom_doctypes_in_list_view.py index 867bead676c..34dec1dbe87 100644 --- a/patches/july_2013/p05_custom_doctypes_in_list_view.py +++ b/patches/july_2013/p05_custom_doctypes_in_list_view.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from webnotes.model import no_value_fields diff --git a/patches/july_2013/p06_same_sales_rate.py b/patches/july_2013/p06_same_sales_rate.py index 8222d3b3613..f481c668db7 100644 --- a/patches/july_2013/p06_same_sales_rate.py +++ b/patches/july_2013/p06_same_sales_rate.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes webnotes.reload_doc("selling", "doctype", "selling_settings") diff --git a/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py b/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py index e18bed0c8ea..272e455f613 100644 --- a/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py +++ b/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/patches/july_2013/p08_custom_print_format_net_total_export.py b/patches/july_2013/p08_custom_print_format_net_total_export.py index c848ac9d626..3d4ae9866c3 100644 --- a/patches/july_2013/p08_custom_print_format_net_total_export.py +++ b/patches/july_2013/p08_custom_print_format_net_total_export.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes import re diff --git a/patches/july_2013/p09_remove_website_pyc.py b/patches/july_2013/p09_remove_website_pyc.py index a8eb71adf7c..afff4bb0d79 100644 --- a/patches/july_2013/p09_remove_website_pyc.py +++ b/patches/july_2013/p09_remove_website_pyc.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import os diff --git a/patches/july_2013/p10_change_partner_user_to_website_user.py b/patches/july_2013/p10_change_partner_user_to_website_user.py index 50bc67114ad..55783453c6a 100644 --- a/patches/july_2013/p10_change_partner_user_to_website_user.py +++ b/patches/july_2013/p10_change_partner_user_to_website_user.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/july_2013/p11_update_price_list_currency.py b/patches/july_2013/p11_update_price_list_currency.py index 887149da154..8b70b79f870 100644 --- a/patches/july_2013/p11_update_price_list_currency.py +++ b/patches/july_2013/p11_update_price_list_currency.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/july_2013/restore_tree_roots.py b/patches/july_2013/restore_tree_roots.py index ea3a9913ea2..0998393df9a 100644 --- a/patches/july_2013/restore_tree_roots.py +++ b/patches/july_2013/restore_tree_roots.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): from startup.install import import_defaults import_defaults() \ No newline at end of file diff --git a/patches/june_2012/alter_tabsessions.py b/patches/june_2012/alter_tabsessions.py index 4e0310bffb0..29ae17796f6 100644 --- a/patches/june_2012/alter_tabsessions.py +++ b/patches/june_2012/alter_tabsessions.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/june_2012/barcode_in_feature_setup.py b/patches/june_2012/barcode_in_feature_setup.py index 4e5217af246..630f50f7891 100644 --- a/patches/june_2012/barcode_in_feature_setup.py +++ b/patches/june_2012/barcode_in_feature_setup.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/june_2012/cms2.py b/patches/june_2012/cms2.py index 17b7d23cc1b..a9171d754ea 100644 --- a/patches/june_2012/cms2.py +++ b/patches/june_2012/cms2.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/june_2012/copy_uom_for_pur_inv_item.py b/patches/june_2012/copy_uom_for_pur_inv_item.py index a22146c6a3b..947d11014d4 100644 --- a/patches/june_2012/copy_uom_for_pur_inv_item.py +++ b/patches/june_2012/copy_uom_for_pur_inv_item.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/june_2012/delete_old_parent_entries.py b/patches/june_2012/delete_old_parent_entries.py index 6a87ff5503b..384df775a5d 100644 --- a/patches/june_2012/delete_old_parent_entries.py +++ b/patches/june_2012/delete_old_parent_entries.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """delete entries of child table having parent like old_par%% or ''""" diff --git a/patches/june_2012/fetch_organization_from_lead.py b/patches/june_2012/fetch_organization_from_lead.py index b3f1eddc748..85b14364a9b 100644 --- a/patches/june_2012/fetch_organization_from_lead.py +++ b/patches/june_2012/fetch_organization_from_lead.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/june_2012/reports_list_permission.py b/patches/june_2012/reports_list_permission.py index 462c2f236bd..c70b659656a 100644 --- a/patches/june_2012/reports_list_permission.py +++ b/patches/june_2012/reports_list_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """allow read permission to all for report list""" diff --git a/patches/june_2012/series_unique_patch.py b/patches/june_2012/series_unique_patch.py index b04e08e312f..4bea9f0f600 100644 --- a/patches/june_2012/series_unique_patch.py +++ b/patches/june_2012/series_unique_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """add unique constraint to series table's name column""" diff --git a/patches/june_2012/set_recurring_type.py b/patches/june_2012/set_recurring_type.py index 7fb416ed7e6..c7d4d63fcbb 100644 --- a/patches/june_2012/set_recurring_type.py +++ b/patches/june_2012/set_recurring_type.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/june_2012/support_ticket_autoreply.py b/patches/june_2012/support_ticket_autoreply.py index 32e095665ce..a9c8d82d6f0 100644 --- a/patches/june_2012/support_ticket_autoreply.py +++ b/patches/june_2012/support_ticket_autoreply.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """New Send Autoreply checkbox in Email Settings""" diff --git a/patches/june_2013/p01_update_bom_exploded_items.py b/patches/june_2013/p01_update_bom_exploded_items.py index f53eb5bc68b..fe0b4ad5e0c 100644 --- a/patches/june_2013/p01_update_bom_exploded_items.py +++ b/patches/june_2013/p01_update_bom_exploded_items.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/patches/june_2013/p02_update_project_completed.py b/patches/june_2013/p02_update_project_completed.py index 54666623e7d..d11c690e51c 100644 --- a/patches/june_2013/p02_update_project_completed.py +++ b/patches/june_2013/p02_update_project_completed.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/june_2013/p03_buying_selling_for_price_list.py b/patches/june_2013/p03_buying_selling_for_price_list.py index 089f0be5598..c71646a8f50 100644 --- a/patches/june_2013/p03_buying_selling_for_price_list.py +++ b/patches/june_2013/p03_buying_selling_for_price_list.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from webnotes.utils import cint diff --git a/patches/june_2013/p04_fix_event_for_lead_oppty_project.py b/patches/june_2013/p04_fix_event_for_lead_oppty_project.py index 971e4c74599..af5072415ce 100644 --- a/patches/june_2013/p04_fix_event_for_lead_oppty_project.py +++ b/patches/june_2013/p04_fix_event_for_lead_oppty_project.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/june_2013/p05_remove_search_criteria_reports.py b/patches/june_2013/p05_remove_search_criteria_reports.py index 48a8221fcbf..188960c5d4b 100644 --- a/patches/june_2013/p05_remove_search_criteria_reports.py +++ b/patches/june_2013/p05_remove_search_criteria_reports.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/patches/june_2013/p05_remove_unused_doctypes.py b/patches/june_2013/p05_remove_unused_doctypes.py index 62cf8807299..d75a66aaa6d 100644 --- a/patches/june_2013/p05_remove_unused_doctypes.py +++ b/patches/june_2013/p05_remove_unused_doctypes.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/june_2013/p06_drop_unused_tables.py b/patches/june_2013/p06_drop_unused_tables.py index baad451c05f..18a20618982 100644 --- a/patches/june_2013/p06_drop_unused_tables.py +++ b/patches/june_2013/p06_drop_unused_tables.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/june_2013/p07_taxes_price_list_for_territory.py b/patches/june_2013/p07_taxes_price_list_for_territory.py index 92048667188..f57ecf81736 100644 --- a/patches/june_2013/p07_taxes_price_list_for_territory.py +++ b/patches/june_2013/p07_taxes_price_list_for_territory.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/june_2013/p08_shopping_cart_settings.py b/patches/june_2013/p08_shopping_cart_settings.py index 4d5ebb3822d..9378c389bd0 100644 --- a/patches/june_2013/p08_shopping_cart_settings.py +++ b/patches/june_2013/p08_shopping_cart_settings.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/june_2013/p09_update_global_defaults.py b/patches/june_2013/p09_update_global_defaults.py index 44d36e1f35f..0fe9247f968 100644 --- a/patches/june_2013/p09_update_global_defaults.py +++ b/patches/june_2013/p09_update_global_defaults.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/june_2013/p10_lead_address.py b/patches/june_2013/p10_lead_address.py index f7b4a8e4682..fc1cbbf9882 100644 --- a/patches/june_2013/p10_lead_address.py +++ b/patches/june_2013/p10_lead_address.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/mar_2012/add_fieldnames.py b/patches/mar_2012/add_fieldnames.py index d0ea04bf439..52cf6b7f821 100644 --- a/patches/mar_2012/add_fieldnames.py +++ b/patches/mar_2012/add_fieldnames.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # do not run this patch from __future__ import unicode_literals def execute(): diff --git a/patches/mar_2012/clean_property_setter.py b/patches/mar_2012/clean_property_setter.py index a9c7b81f360..b4ad9096158 100644 --- a/patches/mar_2012/clean_property_setter.py +++ b/patches/mar_2012/clean_property_setter.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/patches/mar_2012/cleanup_control_panel.py b/patches/mar_2012/cleanup_control_panel.py index 93dd769520f..6692bc441e0 100644 --- a/patches/mar_2012/cleanup_control_panel.py +++ b/patches/mar_2012/cleanup_control_panel.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes def execute(): diff --git a/patches/mar_2012/create_custom_fields.py b/patches/mar_2012/create_custom_fields.py index a91c765e5f2..b9fe2f04378 100644 --- a/patches/mar_2012/create_custom_fields.py +++ b/patches/mar_2012/create_custom_fields.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # do not run this patch from __future__ import unicode_literals field_list = [ diff --git a/patches/mar_2012/delete_docformat.py b/patches/mar_2012/delete_docformat.py index 1b5b94e9731..b6ee2ebd81a 100644 --- a/patches/mar_2012/delete_docformat.py +++ b/patches/mar_2012/delete_docformat.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/mar_2012/doctype_get_refactor.py b/patches/mar_2012/doctype_get_refactor.py index 26402292b4b..0900b9b78ee 100644 --- a/patches/mar_2012/doctype_get_refactor.py +++ b/patches/mar_2012/doctype_get_refactor.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes def execute(): diff --git a/patches/mar_2012/earning_deduction_type_patch.py b/patches/mar_2012/earning_deduction_type_patch.py index 39216d0444e..43a14338b97 100644 --- a/patches/mar_2012/earning_deduction_type_patch.py +++ b/patches/mar_2012/earning_deduction_type_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/mar_2012/is_submittable_patch.py b/patches/mar_2012/is_submittable_patch.py index d97f8564761..b2da16cb2ac 100644 --- a/patches/mar_2012/is_submittable_patch.py +++ b/patches/mar_2012/is_submittable_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # dont run this patch from __future__ import unicode_literals def execute(): diff --git a/patches/mar_2012/pos_invoice_fix.py b/patches/mar_2012/pos_invoice_fix.py index d359408885a..148b3739879 100644 --- a/patches/mar_2012/pos_invoice_fix.py +++ b/patches/mar_2012/pos_invoice_fix.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): from webnotes.modules import reload_doc diff --git a/patches/mar_2012/usertags.py b/patches/mar_2012/usertags.py index f583b638f35..4cb9b14cd70 100644 --- a/patches/mar_2012/usertags.py +++ b/patches/mar_2012/usertags.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/march_2013/p01_c_form.py b/patches/march_2013/p01_c_form.py index 5261d2bc161..54fb802e451 100644 --- a/patches/march_2013/p01_c_form.py +++ b/patches/march_2013/p01_c_form.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/march_2013/p02_get_global_default.py b/patches/march_2013/p02_get_global_default.py index 33983b5c412..d36d5fa85f4 100644 --- a/patches/march_2013/p02_get_global_default.py +++ b/patches/march_2013/p02_get_global_default.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import webnotes.defaults diff --git a/patches/march_2013/p03_rename_blog_to_blog_post.py b/patches/march_2013/p03_rename_blog_to_blog_post.py index 69902f34bee..8078c841465 100644 --- a/patches/march_2013/p03_rename_blog_to_blog_post.py +++ b/patches/march_2013/p03_rename_blog_to_blog_post.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/march_2013/p03_update_buying_amount.py b/patches/march_2013/p03_update_buying_amount.py index 92b171f3e1d..ddb52e0277b 100644 --- a/patches/march_2013/p03_update_buying_amount.py +++ b/patches/march_2013/p03_update_buying_amount.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from webnotes.utils import now_datetime diff --git a/patches/march_2013/p04_pos_update_stock_check.py b/patches/march_2013/p04_pos_update_stock_check.py index da48efe1554..f8570313fc7 100644 --- a/patches/march_2013/p04_pos_update_stock_check.py +++ b/patches/march_2013/p04_pos_update_stock_check.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/march_2013/p05_payment_reconciliation.py b/patches/march_2013/p05_payment_reconciliation.py index 7b6306b3856..ed818dcb84d 100644 --- a/patches/march_2013/p05_payment_reconciliation.py +++ b/patches/march_2013/p05_payment_reconciliation.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/march_2013/p06_remove_sales_purchase_return_tool.py b/patches/march_2013/p06_remove_sales_purchase_return_tool.py index e907e4a1c24..ed8fbc87fd5 100644 --- a/patches/march_2013/p06_remove_sales_purchase_return_tool.py +++ b/patches/march_2013/p06_remove_sales_purchase_return_tool.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/march_2013/p07_update_project_in_stock_ledger.py b/patches/march_2013/p07_update_project_in_stock_ledger.py index ad4d639da9a..66c86fbf103 100644 --- a/patches/march_2013/p07_update_project_in_stock_ledger.py +++ b/patches/march_2013/p07_update_project_in_stock_ledger.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/march_2013/p07_update_valuation_rate.py b/patches/march_2013/p07_update_valuation_rate.py index eaeeac1990f..87a25172dac 100644 --- a/patches/march_2013/p07_update_valuation_rate.py +++ b/patches/march_2013/p07_update_valuation_rate.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/march_2013/p08_create_aii_accounts.py b/patches/march_2013/p08_create_aii_accounts.py index e4260d3508a..03ba36ca7e5 100644 --- a/patches/march_2013/p08_create_aii_accounts.py +++ b/patches/march_2013/p08_create_aii_accounts.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.reload_doc("setup", "doctype", "company") diff --git a/patches/march_2013/p10_set_fiscal_year_for_stock.py b/patches/march_2013/p10_set_fiscal_year_for_stock.py index c9d520279a0..608f188d34c 100644 --- a/patches/march_2013/p10_set_fiscal_year_for_stock.py +++ b/patches/march_2013/p10_set_fiscal_year_for_stock.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from accounts.utils import get_fiscal_year, FiscalYearError diff --git a/patches/march_2013/p10_update_against_expense_account.py b/patches/march_2013/p10_update_against_expense_account.py index 3506ac4936d..8939514ce43 100644 --- a/patches/march_2013/p10_update_against_expense_account.py +++ b/patches/march_2013/p10_update_against_expense_account.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes from webnotes import get_obj diff --git a/patches/march_2013/p11_update_attach_files.py b/patches/march_2013/p11_update_attach_files.py index ef39ce89f8a..5be659db087 100644 --- a/patches/march_2013/p11_update_attach_files.py +++ b/patches/march_2013/p11_update_attach_files.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/march_2013/p12_set_item_tax_rate_in_json.py b/patches/march_2013/p12_set_item_tax_rate_in_json.py index de47c67d92f..27fd7e8584b 100644 --- a/patches/march_2013/p12_set_item_tax_rate_in_json.py +++ b/patches/march_2013/p12_set_item_tax_rate_in_json.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import json diff --git a/patches/march_2013/update_po_prevdoc_doctype.py b/patches/march_2013/update_po_prevdoc_doctype.py index 35e7a257b4e..745420e1a5d 100644 --- a/patches/march_2013/update_po_prevdoc_doctype.py +++ b/patches/march_2013/update_po_prevdoc_doctype.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.conn.sql("""update `tabPurchase Order Item` set prevdoc_doctype = 'Material Request' diff --git a/patches/may_2012/cleanup_notification_control.py b/patches/may_2012/cleanup_notification_control.py index 1a7730ba5be..054f7ec9070 100644 --- a/patches/may_2012/cleanup_notification_control.py +++ b/patches/may_2012/cleanup_notification_control.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/cleanup_property_setter.py b/patches/may_2012/cleanup_property_setter.py index e06de3285db..b793e9d7bb5 100644 --- a/patches/may_2012/cleanup_property_setter.py +++ b/patches/may_2012/cleanup_property_setter.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/clear_session_cache.py b/patches/may_2012/clear_session_cache.py index 2b10129a7ac..3e63c3b2fc8 100644 --- a/patches/may_2012/clear_session_cache.py +++ b/patches/may_2012/clear_session_cache.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/create_report_manager_role.py b/patches/may_2012/create_report_manager_role.py index 8912eb121e3..56f2aa9cd91 100644 --- a/patches/may_2012/create_report_manager_role.py +++ b/patches/may_2012/create_report_manager_role.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/cs_server_readonly.py b/patches/may_2012/cs_server_readonly.py index 51a9b760cf0..378a73da11d 100644 --- a/patches/may_2012/cs_server_readonly.py +++ b/patches/may_2012/cs_server_readonly.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """Make server custom script readonly for system manager""" diff --git a/patches/may_2012/customize_form_cleanup.py b/patches/may_2012/customize_form_cleanup.py index a04eb79566d..ab86f0583cc 100644 --- a/patches/may_2012/customize_form_cleanup.py +++ b/patches/may_2012/customize_form_cleanup.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/page_role_series_fix.py b/patches/may_2012/page_role_series_fix.py index 7533e9db4f3..c2b18f4d7d1 100644 --- a/patches/may_2012/page_role_series_fix.py +++ b/patches/may_2012/page_role_series_fix.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/profile_perm_patch.py b/patches/may_2012/profile_perm_patch.py index 29fa9c05bed..26fc1ab03cc 100644 --- a/patches/may_2012/profile_perm_patch.py +++ b/patches/may_2012/profile_perm_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """Make profile readonly for role All""" diff --git a/patches/may_2012/reload_sales_invoice_pf.py b/patches/may_2012/reload_sales_invoice_pf.py index ea4f5dfde56..72a8e4100e4 100644 --- a/patches/may_2012/reload_sales_invoice_pf.py +++ b/patches/may_2012/reload_sales_invoice_pf.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/remove_communication_log.py b/patches/may_2012/remove_communication_log.py index b6e7e7d2761..0c06f8d6bb4 100644 --- a/patches/may_2012/remove_communication_log.py +++ b/patches/may_2012/remove_communication_log.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/remove_euro_currency.py b/patches/may_2012/remove_euro_currency.py index edf27e19a0b..02e439b63a0 100644 --- a/patches/may_2012/remove_euro_currency.py +++ b/patches/may_2012/remove_euro_currency.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """ diff --git a/patches/may_2012/rename_prev_doctype.py b/patches/may_2012/rename_prev_doctype.py index 9b1e0b66172..81a2578169a 100644 --- a/patches/may_2012/rename_prev_doctype.py +++ b/patches/may_2012/rename_prev_doctype.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/same_purchase_rate_patch.py b/patches/may_2012/same_purchase_rate_patch.py index d7b8d895f21..edb135f8bdc 100644 --- a/patches/may_2012/same_purchase_rate_patch.py +++ b/patches/may_2012/same_purchase_rate_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2012/std_pf_readonly.py b/patches/may_2012/std_pf_readonly.py index 9fbbfe9a3c3..f2e7261f634 100644 --- a/patches/may_2012/std_pf_readonly.py +++ b/patches/may_2012/std_pf_readonly.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): """Make standard print formats readonly for system manager""" diff --git a/patches/may_2012/stock_reco_patch.py b/patches/may_2012/stock_reco_patch.py index 96b071ff44d..a3c702f2f73 100644 --- a/patches/may_2012/stock_reco_patch.py +++ b/patches/may_2012/stock_reco_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/may_2013/p01_conversion_factor_and_aii.py b/patches/may_2013/p01_conversion_factor_and_aii.py index e207653fea3..3821827bbac 100644 --- a/patches/may_2013/p01_conversion_factor_and_aii.py +++ b/patches/may_2013/p01_conversion_factor_and_aii.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from webnotes.utils import cint from accounts.utils import create_stock_in_hand_jv diff --git a/patches/may_2013/p01_selling_net_total_export.py b/patches/may_2013/p01_selling_net_total_export.py index eb6da234ab7..a942f4decee 100644 --- a/patches/may_2013/p01_selling_net_total_export.py +++ b/patches/may_2013/p01_selling_net_total_export.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes.utils import cint diff --git a/patches/may_2013/p02_update_valuation_rate.py b/patches/may_2013/p02_update_valuation_rate.py index 280473ccef7..c8226c83042 100644 --- a/patches/may_2013/p02_update_valuation_rate.py +++ b/patches/may_2013/p02_update_valuation_rate.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/patches/may_2013/p03_update_support_ticket.py b/patches/may_2013/p03_update_support_ticket.py index 7dc5854b44e..005c9a3899b 100644 --- a/patches/may_2013/p03_update_support_ticket.py +++ b/patches/may_2013/p03_update_support_ticket.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/patches/may_2013/p04_reorder_level.py b/patches/may_2013/p04_reorder_level.py index 8f4d669bc56..8462ff9832c 100644 --- a/patches/may_2013/p04_reorder_level.py +++ b/patches/may_2013/p04_reorder_level.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/patches/may_2013/p05_update_cancelled_gl_entries.py b/patches/may_2013/p05_update_cancelled_gl_entries.py index 1dda214efb5..1c9cc84fbb9 100644 --- a/patches/may_2013/p05_update_cancelled_gl_entries.py +++ b/patches/may_2013/p05_update_cancelled_gl_entries.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/patches/may_2013/p06_make_notes.py b/patches/may_2013/p06_make_notes.py index 1cc9bc3e7cb..b60642c53ec 100644 --- a/patches/may_2013/p06_make_notes.py +++ b/patches/may_2013/p06_make_notes.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, markdown2 def execute(): diff --git a/patches/may_2013/p06_update_billed_amt_po_pr.py b/patches/may_2013/p06_update_billed_amt_po_pr.py index 5084e98175c..871a7deedcb 100644 --- a/patches/may_2013/p06_update_billed_amt_po_pr.py +++ b/patches/may_2013/p06_update_billed_amt_po_pr.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals def execute(): diff --git a/patches/may_2013/p07_move_update_stock_to_pos.py b/patches/may_2013/p07_move_update_stock_to_pos.py index 7928728f4a7..c4dfdc0bbb8 100644 --- a/patches/may_2013/p07_move_update_stock_to_pos.py +++ b/patches/may_2013/p07_move_update_stock_to_pos.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, webnotes.defaults from webnotes.utils import cint diff --git a/patches/may_2013/p08_change_item_wise_tax.py b/patches/may_2013/p08_change_item_wise_tax.py index a4f85318fde..bf8491021bd 100644 --- a/patches/may_2013/p08_change_item_wise_tax.py +++ b/patches/may_2013/p08_change_item_wise_tax.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import json from webnotes.utils import flt diff --git a/patches/may_2013/repost_stock_for_no_posting_time.py b/patches/may_2013/repost_stock_for_no_posting_time.py index 489511c53ee..057705bd612 100644 --- a/patches/may_2013/repost_stock_for_no_posting_time.py +++ b/patches/may_2013/repost_stock_for_no_posting_time.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals def execute(): diff --git a/patches/november_2012/add_employee_field_in_employee.py b/patches/november_2012/add_employee_field_in_employee.py index c8e5b3644f6..bece53e6a2b 100644 --- a/patches/november_2012/add_employee_field_in_employee.py +++ b/patches/november_2012/add_employee_field_in_employee.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/november_2012/add_theme_to_profile.py b/patches/november_2012/add_theme_to_profile.py index 89710a4c711..8b4de68d71a 100644 --- a/patches/november_2012/add_theme_to_profile.py +++ b/patches/november_2012/add_theme_to_profile.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/november_2012/cancelled_bom_patch.py b/patches/november_2012/cancelled_bom_patch.py index 761227d5923..150e411b8b0 100644 --- a/patches/november_2012/cancelled_bom_patch.py +++ b/patches/november_2012/cancelled_bom_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/november_2012/communication_sender_and_recipient.py b/patches/november_2012/communication_sender_and_recipient.py index f8d7a95cfe3..f18924fb98f 100644 --- a/patches/november_2012/communication_sender_and_recipient.py +++ b/patches/november_2012/communication_sender_and_recipient.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/november_2012/custom_field_insert_after.py b/patches/november_2012/custom_field_insert_after.py index 6824e7a5e1e..404df40a533 100644 --- a/patches/november_2012/custom_field_insert_after.py +++ b/patches/november_2012/custom_field_insert_after.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/november_2012/customer_issue_allocated_to_assigned.py b/patches/november_2012/customer_issue_allocated_to_assigned.py index fa872627964..d249abe8c6c 100644 --- a/patches/november_2012/customer_issue_allocated_to_assigned.py +++ b/patches/november_2012/customer_issue_allocated_to_assigned.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/patches/november_2012/disable_cancelled_profiles.py b/patches/november_2012/disable_cancelled_profiles.py index cc682dc785c..663004bb296 100644 --- a/patches/november_2012/disable_cancelled_profiles.py +++ b/patches/november_2012/disable_cancelled_profiles.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): """ diff --git a/patches/november_2012/gle_floating_point_issue.py b/patches/november_2012/gle_floating_point_issue.py index c345152a3e7..7ff3aca5475 100644 --- a/patches/november_2012/gle_floating_point_issue.py +++ b/patches/november_2012/gle_floating_point_issue.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes diff --git a/patches/november_2012/leave_application_cleanup.py b/patches/november_2012/leave_application_cleanup.py index eca0fae90f4..196a9f13f1a 100644 --- a/patches/november_2012/leave_application_cleanup.py +++ b/patches/november_2012/leave_application_cleanup.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/november_2012/production_order_patch.py b/patches/november_2012/production_order_patch.py index b49cd726335..1a4e1401061 100644 --- a/patches/november_2012/production_order_patch.py +++ b/patches/november_2012/production_order_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes diff --git a/patches/november_2012/report_permissions.py b/patches/november_2012/report_permissions.py index 061976160a1..31c4b74e4e1 100644 --- a/patches/november_2012/report_permissions.py +++ b/patches/november_2012/report_permissions.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): diff --git a/patches/november_2012/reset_appraisal_permissions.py b/patches/november_2012/reset_appraisal_permissions.py index a9468a6769d..aa4667600d1 100644 --- a/patches/november_2012/reset_appraisal_permissions.py +++ b/patches/november_2012/reset_appraisal_permissions.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.reset_perms("Appraisal") diff --git a/patches/november_2012/support_ticket_response_to_communication.py b/patches/november_2012/support_ticket_response_to_communication.py index 12c1850dfbe..b4d60684687 100644 --- a/patches/november_2012/support_ticket_response_to_communication.py +++ b/patches/november_2012/support_ticket_response_to_communication.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import email.utils diff --git a/patches/november_2012/update_delivered_billed_percentage_for_pos.py b/patches/november_2012/update_delivered_billed_percentage_for_pos.py index 0c9a8ad2b26..0703f946f38 100644 --- a/patches/november_2012/update_delivered_billed_percentage_for_pos.py +++ b/patches/november_2012/update_delivered_billed_percentage_for_pos.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes from webnotes.model.code import get_obj diff --git a/patches/october_2012/company_fiscal_year_docstatus_patch.py b/patches/october_2012/company_fiscal_year_docstatus_patch.py index 34ec2745fe0..0a3cf27c24f 100644 --- a/patches/october_2012/company_fiscal_year_docstatus_patch.py +++ b/patches/october_2012/company_fiscal_year_docstatus_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.conn.sql("""update `tabCompany` set docstatus = 0 diff --git a/patches/october_2012/custom_script_delete_permission.py b/patches/october_2012/custom_script_delete_permission.py index efcb0593e6a..b87a49c4101 100644 --- a/patches/october_2012/custom_script_delete_permission.py +++ b/patches/october_2012/custom_script_delete_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes def execute(): webnotes.reload_doc("core", "doctype", "docperm") diff --git a/patches/october_2012/fix_cancelled_gl_entries.py b/patches/october_2012/fix_cancelled_gl_entries.py index 5c23ce8835a..b610985dcda 100644 --- a/patches/october_2012/fix_cancelled_gl_entries.py +++ b/patches/october_2012/fix_cancelled_gl_entries.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes entries = webnotes.conn.sql("""select voucher_type, voucher_no diff --git a/patches/october_2012/fix_wrong_vouchers.py b/patches/october_2012/fix_wrong_vouchers.py index 3b0a1dd245a..85bf2ab2913 100644 --- a/patches/october_2012/fix_wrong_vouchers.py +++ b/patches/october_2012/fix_wrong_vouchers.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes from webnotes.utils import flt diff --git a/patches/october_2012/update_account_property.py b/patches/october_2012/update_account_property.py index a9d365faf86..cc7d005a577 100644 --- a/patches/october_2012/update_account_property.py +++ b/patches/october_2012/update_account_property.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + def execute(): import webnotes from webnotes.utils.nestedset import rebuild_tree diff --git a/patches/october_2012/update_permission.py b/patches/october_2012/update_permission.py index 5686a8ebc55..04f5d0740f6 100644 --- a/patches/october_2012/update_permission.py +++ b/patches/october_2012/update_permission.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals def execute(): diff --git a/patches/patch_list.py b/patches/patch_list.py index b20fcfd85ce..235d91459ee 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals patch_list = [ @@ -265,4 +252,5 @@ patch_list = [ "patches.july_2013.p11_update_price_list_currency", "execute:webnotes.bean('Selling Settings').save() #2013-07-29", "patches.august_2013.p01_perpetual_accounting_patch", + "patches.august_2013.p01_hr_settings", ] \ No newline at end of file diff --git a/patches/september_2012/add_stock_ledger_entry_index.py b/patches/september_2012/add_stock_ledger_entry_index.py index add0e947773..dc3ed964dd5 100644 --- a/patches/september_2012/add_stock_ledger_entry_index.py +++ b/patches/september_2012/add_stock_ledger_entry_index.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/patches/september_2012/all_permissions_patch.py b/patches/september_2012/all_permissions_patch.py index 8373d8aadfa..bc318ba5a4c 100644 --- a/patches/september_2012/all_permissions_patch.py +++ b/patches/september_2012/all_permissions_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes def execute(): diff --git a/patches/september_2012/communication_delete_permission.py b/patches/september_2012/communication_delete_permission.py index a1a7f6692da..ef4d02e64fa 100644 --- a/patches/september_2012/communication_delete_permission.py +++ b/patches/september_2012/communication_delete_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/patches/september_2012/customer_permission_patch.py b/patches/september_2012/customer_permission_patch.py index a820cbedf86..83341566040 100644 --- a/patches/september_2012/customer_permission_patch.py +++ b/patches/september_2012/customer_permission_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): from webnotes.model.doc import Document diff --git a/patches/september_2012/deprecate_account_balance.py b/patches/september_2012/deprecate_account_balance.py index b8c454d8914..c7e5a8c6803 100644 --- a/patches/september_2012/deprecate_account_balance.py +++ b/patches/september_2012/deprecate_account_balance.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes.model import delete_doc diff --git a/patches/september_2012/event_permission.py b/patches/september_2012/event_permission.py index 1e2c5f5cc27..ad965e55570 100644 --- a/patches/september_2012/event_permission.py +++ b/patches/september_2012/event_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes.model.code import get_obj diff --git a/patches/september_2012/plot_patch.py b/patches/september_2012/plot_patch.py index 802cbcd79c6..e801a992290 100644 --- a/patches/september_2012/plot_patch.py +++ b/patches/september_2012/plot_patch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes def execute(): diff --git a/patches/september_2012/profile_delete_permission.py b/patches/september_2012/profile_delete_permission.py index 2f7243168f4..cf6f8ec9fdd 100644 --- a/patches/september_2012/profile_delete_permission.py +++ b/patches/september_2012/profile_delete_permission.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes def execute(): diff --git a/patches/september_2012/rebuild_trees.py b/patches/september_2012/rebuild_trees.py index 5143f54a3db..380100b31d6 100644 --- a/patches/september_2012/rebuild_trees.py +++ b/patches/september_2012/rebuild_trees.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): from webnotes.utils.nestedset import rebuild_tree diff --git a/patches/september_2012/repost_stock.py b/patches/september_2012/repost_stock.py index deb218637e9..28ad703fef8 100644 --- a/patches/september_2012/repost_stock.py +++ b/patches/september_2012/repost_stock.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals def execute(): diff --git a/patches/september_2012/stock_report_permissions_for_accounts.py b/patches/september_2012/stock_report_permissions_for_accounts.py index 07efc467442..7dd614cb29e 100644 --- a/patches/september_2012/stock_report_permissions_for_accounts.py +++ b/patches/september_2012/stock_report_permissions_for_accounts.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals def execute(): import webnotes diff --git a/projects/doctype/activity_type/activity_type.py b/projects/doctype/activity_type/activity_type.py index 7f48feb2ebf..26d0f769688 100644 --- a/projects/doctype/activity_type/activity_type.py +++ b/projects/doctype/activity_type/activity_type.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/projects/doctype/activity_type/test_activity_type.py b/projects/doctype/activity_type/test_activity_type.py index 77ef7b30bff..b68a4581ee6 100644 --- a/projects/doctype/activity_type/test_activity_type.py +++ b/projects/doctype/activity_type/test_activity_type.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{"activity_type":"_Test Activity Type"}], [{"activity_type":"_Test Activity Type 1"}], diff --git a/projects/doctype/project/project.js b/projects/doctype/project/project.js index 9d04477a293..74cfa45198b 100644 --- a/projects/doctype/project/project.js +++ b/projects/doctype/project/project.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // show tasks cur_frm.cscript.refresh = function(doc) { diff --git a/projects/doctype/project/project.py b/projects/doctype/project/project.py index d9bb7c02f4e..067ffef5dfc 100644 --- a/projects/doctype/project/project.py +++ b/projects/doctype/project/project.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/projects/doctype/project/test_project.py b/projects/doctype/project/test_project.py index bd7460d077f..475dc6847f7 100644 --- a/projects/doctype/project/test_project.py +++ b/projects/doctype/project/test_project.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{ "project_name": "_Test Project", "status": "Open" diff --git a/projects/doctype/project_milestone/project_milestone.py b/projects/doctype/project_milestone/project_milestone.py index 7f48feb2ebf..26d0f769688 100644 --- a/projects/doctype/project_milestone/project_milestone.py +++ b/projects/doctype/project_milestone/project_milestone.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/projects/doctype/task/task.js b/projects/doctype/task/task.js index 7ecb2240554..c043807d7e8 100644 --- a/projects/doctype/task/task.js +++ b/projects/doctype/task/task.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.projects"); diff --git a/projects/doctype/task/task.py b/projects/doctype/task/task.py index 0ea9eea1eb2..6cd1ba8636e 100644 --- a/projects/doctype/task/task.py +++ b/projects/doctype/task/task.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes, json diff --git a/projects/doctype/task/task_calendar.js b/projects/doctype/task/task_calendar.js index 94d7cc509ff..77728553e06 100644 --- a/projects/doctype/task/task_calendar.js +++ b/projects/doctype/task/task_calendar.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.views.calendar["Task"] = { field_map: { "start": "exp_start_date", diff --git a/projects/doctype/task/test_task.py b/projects/doctype/task/test_task.py index 2e95806cb0e..d6c8e98c161 100644 --- a/projects/doctype/task/test_task.py +++ b/projects/doctype/task/test_task.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{"subject": "_Test Task", "project":"_Test Project", "status":"Open"}], [{"subject": "_Test Task 1", "status":"Open"}], diff --git a/projects/doctype/time_log/test_time_log.py b/projects/doctype/time_log/test_time_log.py index 8f1848f4737..ec8c7816b4a 100644 --- a/projects/doctype/time_log/test_time_log.py +++ b/projects/doctype/time_log/test_time_log.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes import unittest diff --git a/projects/doctype/time_log/time_log.js b/projects/doctype/time_log/time_log.js index 26d2398652f..7a03955e2a9 100644 --- a/projects/doctype/time_log/time_log.js +++ b/projects/doctype/time_log/time_log.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.provide("erpnext.projects"); erpnext.projects.TimeLog = wn.ui.form.Controller.extend({ diff --git a/projects/doctype/time_log/time_log.py b/projects/doctype/time_log/time_log.py index 0a5adba5830..57a0b009129 100644 --- a/projects/doctype/time_log/time_log.py +++ b/projects/doctype/time_log/time_log.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/projects/doctype/time_log/time_log_calendar.js b/projects/doctype/time_log/time_log_calendar.js index 52338a91e3f..a4f22db3294 100644 --- a/projects/doctype/time_log/time_log_calendar.js +++ b/projects/doctype/time_log/time_log_calendar.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.views.calendar["Time Log"] = { field_map: { "start": "from_time", diff --git a/projects/doctype/time_log/time_log_list.js b/projects/doctype/time_log/time_log_list.js index 85c9b2a1eff..7a35cda9ae3 100644 --- a/projects/doctype/time_log/time_log_list.js +++ b/projects/doctype/time_log/time_log_list.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // render wn.listview_settings['Time Log'] = { add_fields: ["`tabTime Log`.`status`", "`tabTime Log`.`billable`", "`tabTime Log`.`activity_type`"], diff --git a/projects/doctype/time_log_batch/test_time_log_batch.py b/projects/doctype/time_log_batch/test_time_log_batch.py index 54195c29cb2..34a0cc06c9f 100644 --- a/projects/doctype/time_log_batch/test_time_log_batch.py +++ b/projects/doctype/time_log_batch/test_time_log_batch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, unittest class TimeLogBatchTest(unittest.TestCase): diff --git a/projects/doctype/time_log_batch/time_log_batch.js b/projects/doctype/time_log_batch/time_log_batch.js index 6e5165b50f3..96f7c2229df 100644 --- a/projects/doctype/time_log_batch/time_log_batch.js +++ b/projects/doctype/time_log_batch/time_log_batch.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + cur_frm.add_fetch("time_log", "activity_type", "activity_type"); cur_frm.add_fetch("time_log", "owner", "created_by"); cur_frm.add_fetch("time_log", "hours", "hours"); diff --git a/projects/doctype/time_log_batch/time_log_batch.py b/projects/doctype/time_log_batch/time_log_batch.py index 6ec0e5b4653..41c0f6d6d10 100644 --- a/projects/doctype/time_log_batch/time_log_batch.py +++ b/projects/doctype/time_log_batch/time_log_batch.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/projects/doctype/time_log_batch_detail/time_log_batch_detail.py b/projects/doctype/time_log_batch_detail/time_log_batch_detail.py index 928aa9ff9f2..784339de7db 100644 --- a/projects/doctype/time_log_batch_detail/time_log_batch_detail.py +++ b/projects/doctype/time_log_batch_detail/time_log_batch_detail.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/projects/page/projects_home/projects_home.js b/projects/page/projects_home/projects_home.js index ea078e8fa80..f958f746f2a 100644 --- a/projects/page/projects_home/projects_home.js +++ b/projects/page/projects_home/projects_home.js @@ -1,5 +1,5 @@ -// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -// GNU General Public License. See "license.txt" +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt" wn.module_page["Projects"] = [ { diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.js b/projects/report/daily_time_log_summary/daily_time_log_summary.js index ba87d0d2f76..6bb1117ba64 100644 --- a/projects/report/daily_time_log_summary/daily_time_log_summary.js +++ b/projects/report/daily_time_log_summary/daily_time_log_summary.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Daily Time Log Summary"] = { "filters": [ { diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.py b/projects/report/daily_time_log_summary/daily_time_log_summary.py index 8c1e2668cd2..a710c8c593f 100644 --- a/projects/report/daily_time_log_summary/daily_time_log_summary.py +++ b/projects/report/daily_time_log_summary/daily_time_log_summary.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes from webnotes.utils import flt diff --git a/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py b/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py index 7c702e41cb4..5d126f5506a 100644 --- a/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +++ b/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt import webnotes diff --git a/projects/utils.py b/projects/utils.py index e37a21c2c49..3271e895791 100644 --- a/projects/utils.py +++ b/projects/utils.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/public/js/account_tree_grid.js b/public/js/account_tree_grid.js index a893a52f003..02ea389cb50 100644 --- a/public/js/account_tree_grid.js +++ b/public/js/account_tree_grid.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // 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 diff --git a/public/js/complete_setup.js b/public/js/complete_setup.js index 3a6bad56f0d..b661e025d06 100644 --- a/public/js/complete_setup.js +++ b/public/js/complete_setup.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // complete my company registration // -------------------------------- diff --git a/public/js/conf.js b/public/js/conf.js index 330a2beaaf8..033b2510aa4 100644 --- a/public/js/conf.js +++ b/public/js/conf.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.provide('erpnext'); erpnext.set_about = function() { wn.provide('wn.app'); diff --git a/public/js/controllers/stock_controller.js b/public/js/controllers/stock_controller.js index d5c2073199a..f90317e4a6b 100644 --- a/public/js/controllers/stock_controller.js +++ b/public/js/controllers/stock_controller.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.stock"); diff --git a/public/js/feature_setup.js b/public/js/feature_setup.js index 4ce50f0a8bb..31f81be342c 100644 --- a/public/js/feature_setup.js +++ b/public/js/feature_setup.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt /* features setup "Dictionary", "Script" Dictionary Format diff --git a/public/js/purchase_trends_filters.js b/public/js/purchase_trends_filters.js index 400fb030621..5a13066a249 100644 --- a/public/js/purchase_trends_filters.js +++ b/public/js/purchase_trends_filters.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + var get_filters = function(){ return [ { diff --git a/public/js/queries.js b/public/js/queries.js index 090c393e058..fbd294757f1 100644 --- a/public/js/queries.js +++ b/public/js/queries.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // searches for enabled profiles wn.provide("erpnext.queries"); diff --git a/public/js/sales_trends_filters.js b/public/js/sales_trends_filters.js index 91f2805c12b..63f6e63e5a0 100644 --- a/public/js/sales_trends_filters.js +++ b/public/js/sales_trends_filters.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + var get_filters = function(){ return[ { diff --git a/public/js/startup.js b/public/js/startup.js index eadfa1b6cbc..000e1b566e0 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt var current_module; diff --git a/public/js/stock_analytics.js b/public/js/stock_analytics.js index 91384f61ed9..a349b6e3794 100644 --- a/public/js/stock_analytics.js +++ b/public/js/stock_analytics.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require("app/js/stock_grid_report.js"); diff --git a/public/js/stock_grid_report.js b/public/js/stock_grid_report.js index 173eb218454..8b79b5e1eea 100644 --- a/public/js/stock_grid_report.js +++ b/public/js/stock_grid_report.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt erpnext.StockGridReport = wn.views.TreeGridReport.extend({ get_item_warehouse: function(warehouse, item) { diff --git a/public/js/toolbar.js b/public/js/toolbar.js index f54996942b7..d2ca512fa6f 100644 --- a/public/js/toolbar.js +++ b/public/js/toolbar.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt /* toolbar settings */ wn.provide('erpnext.toolbar'); diff --git a/public/js/transaction.js b/public/js/transaction.js index 4a647adc1cf..7a1dc0c6c45 100644 --- a/public/js/transaction.js +++ b/public/js/transaction.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext"); wn.require("app/js/controllers/stock_controller.js"); @@ -53,22 +40,6 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ this.set_dynamic_labels(); }, - onload_post_render: function() { - if(this.frm.doc.__islocal && this.frm.doc.company) { - var me = this; - return this.frm.call({ - doc: this.frm.doc, - method: "onload_post_render", - freeze: true, - callback: function(r) { - // remove this call when using client side mapper - me.set_default_values(); - me.frm.refresh(); - } - }); - } - }, - validate: function() { this.calculate_taxes_and_totals(); }, @@ -195,6 +166,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ var company_currency = this.get_company_currency(); this.change_form_labels(company_currency); this.change_grid_labels(company_currency); + this.frm.refresh_fields(); }, recalculate: function() { @@ -314,15 +286,15 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ var tax_rate = tax_data[0] == null ? "" : (flt(tax_data[0], tax_rate_precision) + "%"), tax_amount = format_currency(flt(tax_data[1], tax_amount_precision), company_currency); - item_tax[item_code][tax.account_head] = [tax_rate, tax_amount]; + item_tax[item_code][tax.name] = [tax_rate, tax_amount]; } else { - item_tax[item_code][tax.account_head] = [flt(tax_data, tax_rate_precision) + "%", ""]; + item_tax[item_code][tax.name] = [flt(tax_data, tax_rate_precision) + "%", ""]; } }); - tax_accounts.push(tax.account_head); + tax_accounts.push([tax.name, tax.account_head]); }); - var headings = $.map([wn._("Item Name")].concat(tax_accounts), + var headings = $.map([wn._("Item Name")].concat($.map(tax_accounts, function(head) { return head[1]; })), function(head) { return '' + (head || "") + "" }).join("\n"); var rows = $.map(this.get_item_doclist(), function(item) { @@ -331,8 +303,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ return repl("%(item_name)s%(taxes)s", { item_name: item.item_name, taxes: $.map(tax_accounts, function(head) { - return item_tax_record[head] ? - "(" + item_tax_record[head][0] + ") " + item_tax_record[head][1] + "" : + return item_tax_record[head[0]] ? + "(" + item_tax_record[head[0]][0] + ") " + item_tax_record[head[0]][1] + "" : ""; }).join("\n") }); @@ -345,17 +317,6 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ '; }, - set_default_values: function() { - $.each(wn.model.get_doclist(this.frm.doctype, this.frm.docname), function(i, doc) { - var updated = wn.model.set_default_values(doc); - if(doc.parentfield) { - refresh_field(doc.parentfield); - } else { - refresh_field(updated); - } - }); - }, - _validate_before_fetch: function(fieldname) { var me = this; if(!me.frm.doc[fieldname]) { diff --git a/public/js/utils.js b/public/js/utils.js index 96b312f3ce0..aee55bab754 100644 --- a/public/js/utils.js +++ b/public/js/utils.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext"); $.extend(erpnext, { diff --git a/public/js/website_utils.js b/public/js/website_utils.js index f034be23dce..95cae1bbc61 100644 --- a/public/js/website_utils.js +++ b/public/js/website_utils.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + var erpnext = {}; var wn = {}; diff --git a/selling/doctype/campaign/campaign.js b/selling/doctype/campaign/campaign.js index 3cad9447a9b..e8c3c69c7fb 100644 --- a/selling/doctype/campaign/campaign.js +++ b/selling/doctype/campaign/campaign.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/selling/doctype/campaign/campaign.py b/selling/doctype/campaign/campaign.py index 6c41e4f0397..8bb44eefc45 100644 --- a/selling/doctype/campaign/campaign.py +++ b/selling/doctype/campaign/campaign.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/campaign/test_campaign.py b/selling/doctype/campaign/test_campaign.py index 4783fffda20..20641a29da2 100644 --- a/selling/doctype/campaign/test_campaign.py +++ b/selling/doctype/campaign/test_campaign.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{"doctype":"Campaign", "campaign_name":"_Test Campaign"}], [{"doctype":"Campaign", "campaign_name":"_Test Campaign 1"}], diff --git a/selling/doctype/customer/customer.js b/selling/doctype/customer/customer.js index 935afb0829d..4e2f42c7340 100644 --- a/selling/doctype/customer/customer.js +++ b/selling/doctype/customer/customer.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require('app/setup/doctype/contact_control/contact_control.js'); diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py index 9022cb5f9e6..f516ef2495d 100644 --- a/selling/doctype/customer/customer.py +++ b/selling/doctype/customer/customer.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/customer/test_customer.py b/selling/doctype/customer/test_customer.py index 806585f1e1a..9ed821ab74d 100644 --- a/selling/doctype/customer/test_customer.py +++ b/selling/doctype/customer/test_customer.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/customer_discount/customer_discount.py b/selling/doctype/customer_discount/customer_discount.py index 928aa9ff9f2..784339de7db 100644 --- a/selling/doctype/customer_discount/customer_discount.py +++ b/selling/doctype/customer_discount/customer_discount.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/selling/doctype/industry_type/industry_type.js b/selling/doctype/industry_type/industry_type.js index 3cad9447a9b..e8c3c69c7fb 100644 --- a/selling/doctype/industry_type/industry_type.js +++ b/selling/doctype/industry_type/industry_type.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/selling/doctype/industry_type/industry_type.py b/selling/doctype/industry_type/industry_type.py index 6c41e4f0397..8bb44eefc45 100644 --- a/selling/doctype/industry_type/industry_type.py +++ b/selling/doctype/industry_type/industry_type.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/industry_type/test_industry_type.py b/selling/doctype/industry_type/test_industry_type.py index 344080720ea..84ca31e00bd 100644 --- a/selling/doctype/industry_type/test_industry_type.py +++ b/selling/doctype/industry_type/test_industry_type.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{"doctype":"Industry Type", "industry":"_Test Industry"}], [{"doctype":"Industry Type", "industry":"_Test Industry 1"}], diff --git a/selling/doctype/installation_note/installation_note.js b/selling/doctype/installation_note/installation_note.js index b6f094f9b91..4476c9560f0 100644 --- a/selling/doctype/installation_note/installation_note.js +++ b/selling/doctype/installation_note/installation_note.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.tname = "Installation Note Item"; cur_frm.cscript.fname = "installed_item_details"; diff --git a/selling/doctype/installation_note/installation_note.py b/selling/doctype/installation_note/installation_note.py index fd85443db6c..93a1bc12b58 100644 --- a/selling/doctype/installation_note/installation_note.py +++ b/selling/doctype/installation_note/installation_note.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/installation_note_item/installation_note_item.py b/selling/doctype/installation_note_item/installation_note_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/selling/doctype/installation_note_item/installation_note_item.py +++ b/selling/doctype/installation_note_item/installation_note_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/lead/get_leads.py b/selling/doctype/lead/get_leads.py index 892bfd926ea..c376f450a4a 100644 --- a/selling/doctype/lead/get_leads.py +++ b/selling/doctype/lead/get_leads.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js index a20b3314a4b..40887393889 100644 --- a/selling/doctype/lead/lead.js +++ b/selling/doctype/lead/lead.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require('app/utilities/doctype/sms_control/sms_control.js'); wn.require('app/setup/doctype/contact_control/contact_control.js'); diff --git a/selling/doctype/lead/lead.py b/selling/doctype/lead/lead.py index 4ec213c7ae3..b2016aa7a90 100644 --- a/selling/doctype/lead/lead.py +++ b/selling/doctype/lead/lead.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/lead/test_lead.py b/selling/doctype/lead/test_lead.py index 3893a3fce7c..3be3adaf0a2 100644 --- a/selling/doctype/lead/test_lead.py +++ b/selling/doctype/lead/test_lead.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals test_records = [ diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js index fb5bae5f61f..1ec3f3fc4c0 100644 --- a/selling/doctype/opportunity/opportunity.js +++ b/selling/doctype/opportunity/opportunity.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require('app/utilities/doctype/sms_control/sms_control.js'); diff --git a/selling/doctype/opportunity/opportunity.py b/selling/doctype/opportunity/opportunity.py index e48fff9f906..906e5470b0c 100644 --- a/selling/doctype/opportunity/opportunity.py +++ b/selling/doctype/opportunity/opportunity.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/opportunity_item/opportunity_item.py b/selling/doctype/opportunity_item/opportunity_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/selling/doctype/opportunity_item/opportunity_item.py +++ b/selling/doctype/opportunity_item/opportunity_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js index 08ec6ab0aef..fcebe357f87 100644 --- a/selling/doctype/quotation/quotation.js +++ b/selling/doctype/quotation/quotation.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Module CRM // ===================================================================================== diff --git a/selling/doctype/quotation/quotation.py b/selling/doctype/quotation/quotation.py index abb1a1c24e9..b6ff1d7fd9a 100644 --- a/selling/doctype/quotation/quotation.py +++ b/selling/doctype/quotation/quotation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -253,8 +240,7 @@ def _make_sales_order(source_name, target_doclist=None, ignore_permissions=False "doctype": "Sales Order Item", "field_map": { "parent": "prevdoc_docname" - }, - "add_if_empty": True + } }, "Sales Taxes and Charges": { "doctype": "Sales Taxes and Charges", diff --git a/selling/doctype/quotation/test_quotation.py b/selling/doctype/quotation/test_quotation.py index 49fa73639d3..41d50e79307 100644 --- a/selling/doctype/quotation/test_quotation.py +++ b/selling/doctype/quotation/test_quotation.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, json from webnotes.utils import flt import unittest diff --git a/selling/doctype/quotation_item/quotation_item.py b/selling/doctype/quotation_item/quotation_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/selling/doctype/quotation_item/quotation_item.py +++ b/selling/doctype/quotation_item/quotation_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/sales_bom/sales_bom.js b/selling/doctype/sales_bom/sales_bom.js index b67050c3b4d..80e66b824d6 100644 --- a/selling/doctype/sales_bom/sales_bom.js +++ b/selling/doctype/sales_bom/sales_bom.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.toggle_enable('new_item_code', doc.__islocal); diff --git a/selling/doctype/sales_bom/sales_bom.py b/selling/doctype/sales_bom/sales_bom.py index 43ab040dc4d..a6b123a3c32 100644 --- a/selling/doctype/sales_bom/sales_bom.py +++ b/selling/doctype/sales_bom/sales_bom.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -92,7 +79,7 @@ def get_new_item_code(doctype, txt, searchfield, start, page_len, filters): return webnotes.conn.sql("""select name, description from tabItem where is_stock_item="No" and is_sales_item="Yes" - and name not in (select name from `tabSales BOM`) and %s like "%s" + and name not in (select name from `tabSales BOM`) and %s like %s %s limit %s, %s""" % (searchfield, "%s", get_match_cond(doctype, searchfield),"%s", "%s"), ("%%%s%%" % txt, start, page_len)) \ No newline at end of file diff --git a/selling/doctype/sales_bom/test_sales_bom.py b/selling/doctype/sales_bom/test_sales_bom.py index 850616fdbbf..7d273a9467e 100644 --- a/selling/doctype/sales_bom/test_sales_bom.py +++ b/selling/doctype/sales_bom/test_sales_bom.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [ { diff --git a/selling/doctype/sales_bom_item/sales_bom_item.py b/selling/doctype/sales_bom_item/sales_bom_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/selling/doctype/sales_bom_item/sales_bom_item.py +++ b/selling/doctype/sales_bom_item/sales_bom_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js index e59a7474f9c..0c4edd45d6e 100644 --- a/selling/doctype/sales_common/sales_common.js +++ b/selling/doctype/sales_common/sales_common.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Preset // ------ @@ -29,6 +16,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ this._super(); this.toggle_rounded_total(); this.setup_queries(); + this.toggle_editable_price_list_rate(); }, setup_queries: function() { @@ -317,6 +305,15 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ } }, + toggle_editable_price_list_rate: function() { + var df = wn.meta.get_docfield(this.tname, "ref_rate", this.frm.doc.name); + var editable_price_list_rate = cint(wn.defaults.get_default("editable_price_list_rate")); + + if(df && editable_price_list_rate) { + df.read_only = 0; + } + }, + calculate_taxes_and_totals: function() { this._super(); this.calculate_total_advance("Sales Invoice", "advance_adjustment_details"); @@ -595,7 +592,10 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ // toggle columns var item_grid = this.frm.fields_dict[this.fname].grid; - var show = this.frm.doc.currency != company_currency; + var show = (this.frm.doc.currency != company_currency) || + (wn.model.get_doclist(cur_frm.doctype, cur_frm.docname, + {parentfield: "other_charges", included_in_print_rate: 1}).length); + $.each(["basic_rate", "base_ref_rate", "amount"], function(i, fname) { if(wn.meta.get_docfield(item_grid.doctype, fname)) item_grid.set_column_disp(fname, show); @@ -604,7 +604,9 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ // set labels var $wrapper = $(this.frm.wrapper); $.each(field_label_map, function(fname, label) { - $wrapper.find('[data-grid-fieldname="'+fname+'"]').text(label); + fname = fname.split("-"); + var df = wn.meta.get_docfield(fname[0], fname[1], me.frm.doc.name); + if(df) df.label = label; }); }, diff --git a/selling/doctype/sales_common/sales_common.py b/selling/doctype/sales_common/sales_common.py index ef140544fc8..728eda879fe 100644 --- a/selling/doctype/sales_common/sales_common.py +++ b/selling/doctype/sales_common/sales_common.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js index 8c1c2d2c82b..33699f05d84 100644 --- a/selling/doctype/sales_order/sales_order.js +++ b/selling/doctype/sales_order/sales_order.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Module CRM diff --git a/selling/doctype/sales_order/sales_order.py b/selling/doctype/sales_order/sales_order.py index d578a43d198..a9bb7a2140f 100644 --- a/selling/doctype/sales_order/sales_order.py +++ b/selling/doctype/sales_order/sales_order.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -139,11 +126,8 @@ class DocType(SellingController): self.validate_mandatory() self.validate_proj_cust() self.validate_po() - self.validate_uom_is_integer("stock_uom", "qty") - - if self.doc.docstatus == 1: - self.validate_for_items() - + self.validate_uom_is_integer("stock_uom", "qty") + self.validate_for_items() sales_com_obj = get_obj(dt = 'Sales Common') sales_com_obj.check_active_sales_items(self) sales_com_obj.check_conversion_rate(self) @@ -503,4 +487,4 @@ def make_maintenance_visit(source_name, target_doclist=None): } }, target_doclist) - return [d.fields for d in doclist] \ No newline at end of file + return [d.fields for d in doclist] diff --git a/selling/doctype/sales_order/test_sales_order.py b/selling/doctype/sales_order/test_sales_order.py index 95f4be0cf25..aa632a3d50e 100644 --- a/selling/doctype/sales_order/test_sales_order.py +++ b/selling/doctype/sales_order/test_sales_order.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes from webnotes.utils import flt import unittest diff --git a/selling/doctype/sales_order_item/sales_order_item.py b/selling/doctype/sales_order_item/sales_order_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/selling/doctype/sales_order_item/sales_order_item.py +++ b/selling/doctype/sales_order_item/sales_order_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/sales_team/sales_team.py b/selling/doctype/sales_team/sales_team.py index 7f48feb2ebf..26d0f769688 100644 --- a/selling/doctype/sales_team/sales_team.py +++ b/selling/doctype/sales_team/sales_team.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/doctype/selling_settings/selling_settings.py b/selling/doctype/selling_settings/selling_settings.py index febf3754ef7..225c2213d28 100644 --- a/selling/doctype/selling_settings/selling_settings.py +++ b/selling/doctype/selling_settings/selling_settings.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals @@ -8,5 +11,6 @@ class DocType: self.doc, self.doclist = d, dl def validate(self): - for key in ["cust_master_name", "customer_group", "territory", "maintain_same_sales_rate"]: - webnotes.conn.set_default(key, self.doc.fields.get(key, "")) + for key in ["cust_master_name", "customer_group", "territory", "maintain_same_sales_rate", + "editable_price_list_rate"]: + webnotes.conn.set_default(key, self.doc.fields.get(key, "")) diff --git a/selling/doctype/selling_settings/selling_settings.txt b/selling/doctype/selling_settings/selling_settings.txt index 934cd41d27b..97a339a4864 100644 --- a/selling/doctype/selling_settings/selling_settings.txt +++ b/selling/doctype/selling_settings/selling_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-25 10:25:16", "docstatus": 0, - "modified": "2013-07-18 12:03:39", + "modified": "2013-08-02 12:09:20", "modified_by": "Administrator", "owner": "Administrator" }, @@ -94,6 +94,12 @@ "fieldtype": "Check", "label": "Maintain Same Rate Throughout Sales Cycle" }, + { + "doctype": "DocField", + "fieldname": "editable_price_list_rate", + "fieldtype": "Check", + "label": "Allow user to edit Price List Rate in transactions" + }, { "doctype": "DocPerm" } diff --git a/selling/doctype/sms_center/sms_center.py b/selling/doctype/sms_center/sms_center.py index e834042cae9..29e793c04e8 100644 --- a/selling/doctype/sms_center/sms_center.py +++ b/selling/doctype/sms_center/sms_center.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/page/sales_analytics/sales_analytics.js b/selling/page/sales_analytics/sales_analytics.js index 8f09197f35e..0159ae021c5 100644 --- a/selling/page/sales_analytics/sales_analytics.js +++ b/selling/page/sales_analytics/sales_analytics.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.pages['sales-analytics'].onload = function(wrapper) { wn.ui.make_app_page({ diff --git a/selling/page/sales_browser/sales_browser.js b/selling/page/sales_browser/sales_browser.js index a1578cfcedd..53df1887b60 100644 --- a/selling/page/sales_browser/sales_browser.js +++ b/selling/page/sales_browser/sales_browser.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt pscript['onload_Sales Browser'] = function(wrapper){ wn.ui.make_app_page({ diff --git a/selling/page/sales_browser/sales_browser.py b/selling/page/sales_browser/sales_browser.py index 6693fe53b64..6ee80fe3242 100644 --- a/selling/page/sales_browser/sales_browser.py +++ b/selling/page/sales_browser/sales_browser.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js index ffd89128fef..4860d42a38c 100644 --- a/selling/page/selling_home/selling_home.js +++ b/selling/page/selling_home/selling_home.js @@ -1,5 +1,5 @@ -// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -// GNU General Public License. See "license.txt" +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt" wn.module_page["Selling"] = [ { diff --git a/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py b/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py index 171c3bb8d9a..ec09c181389 100644 --- a/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py +++ b/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js index 65d63484a5e..d527b344b88 100644 --- a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +++ b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Customers Not Buying Since Long Time"] = { "filters": [ { diff --git a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py index 08809a7619a..fbe1bb810cf 100644 --- a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +++ b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/report/quotation_trends/quotation_trends.js b/selling/report/quotation_trends/quotation_trends.js index 2f9f23666c2..df8bd49153f 100644 --- a/selling/report/quotation_trends/quotation_trends.js +++ b/selling/report/quotation_trends/quotation_trends.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.require("app/js/sales_trends_filters.js"); wn.query_reports["Quotation Trends"] = { diff --git a/selling/report/quotation_trends/quotation_trends.py b/selling/report/quotation_trends/quotation_trends.py index 29f9ef82c2f..6eae9492b8f 100644 --- a/selling/report/quotation_trends/quotation_trends.py +++ b/selling/report/quotation_trends/quotation_trends.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/report/sales_order_trends/sales_order_trends.js b/selling/report/sales_order_trends/sales_order_trends.js index 458fee6ed3b..8cab41356da 100644 --- a/selling/report/sales_order_trends/sales_order_trends.js +++ b/selling/report/sales_order_trends/sales_order_trends.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.require("app/js/sales_trends_filters.js"); wn.query_reports["Sales Order Trends"] = { diff --git a/selling/report/sales_order_trends/sales_order_trends.py b/selling/report/sales_order_trends/sales_order_trends.py index ac7c3ab97b2..7e42a711da7 100644 --- a/selling/report/sales_order_trends/sales_order_trends.py +++ b/selling/report/sales_order_trends/sales_order_trends.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js index c7a5d668c48..5f2b89cbbd8 100644 --- a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +++ b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Sales Person Target Variance Item Group-Wise"] = { "filters": [ { diff --git a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py index ae3819c2cb1..96c147fd644 100644 --- a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +++ b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js index f85f699d323..6ddb5f97c9d 100644 --- a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js +++ b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Sales Person-wise Transaction Summary"] = { "filters": [ { diff --git a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py index 8ec3a1826ee..45e893e4142 100644 --- a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +++ b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js index 146b17d02b8..882cdb6e83a 100644 --- a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js +++ b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Territory Target Variance Item Group-Wise"] = { "filters": [ { diff --git a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py index 109acbdbe85..4a8cc7c8889 100644 --- a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +++ b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/selling/utils.py b/selling/utils.py index 43a5ad84c46..2d4fcc47957 100644 --- a/selling/utils.py +++ b/selling/utils.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/authorization_control/authorization_control.py b/setup/doctype/authorization_control/authorization_control.py index 33687c7fbe5..ddf0791bde1 100644 --- a/setup/doctype/authorization_control/authorization_control.py +++ b/setup/doctype/authorization_control/authorization_control.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/authorization_rule/authorization_rule.js b/setup/doctype/authorization_rule/authorization_rule.js index fce04973f69..02747a03518 100644 --- a/setup/doctype/authorization_rule/authorization_rule.js +++ b/setup/doctype/authorization_rule/authorization_rule.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/setup/doctype/authorization_rule/authorization_rule.py b/setup/doctype/authorization_rule/authorization_rule.py index 9f19701b8d5..3d2de4776d6 100644 --- a/setup/doctype/authorization_rule/authorization_rule.py +++ b/setup/doctype/authorization_rule/authorization_rule.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/backup_manager/backup_dropbox.py b/setup/doctype/backup_manager/backup_dropbox.py index 054d2b26b6d..8d163539522 100644 --- a/setup/doctype/backup_manager/backup_dropbox.py +++ b/setup/doctype/backup_manager/backup_dropbox.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # SETUP: # install pip install --upgrade dropbox # diff --git a/setup/doctype/backup_manager/backup_googledrive.py b/setup/doctype/backup_manager/backup_googledrive.py index 533b37ddb0d..5d7b6ad0fa1 100644 --- a/setup/doctype/backup_manager/backup_googledrive.py +++ b/setup/doctype/backup_manager/backup_googledrive.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # SETUP: # install pip install --upgrade google-api-python-client # diff --git a/setup/doctype/backup_manager/backup_manager.js b/setup/doctype/backup_manager/backup_manager.js index 870922ed90f..f2de49c395b 100644 --- a/setup/doctype/backup_manager/backup_manager.js +++ b/setup/doctype/backup_manager/backup_manager.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + $.extend(cur_frm.cscript, { refresh: function() { cur_frm.disable_save(); diff --git a/setup/doctype/backup_manager/backup_manager.py b/setup/doctype/backup_manager/backup_manager.py index c91cf1110fa..aaf17f5ffaa 100644 --- a/setup/doctype/backup_manager/backup_manager.py +++ b/setup/doctype/backup_manager/backup_manager.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/setup/doctype/brand/brand.js b/setup/doctype/brand/brand.js index 3cad9447a9b..e8c3c69c7fb 100644 --- a/setup/doctype/brand/brand.js +++ b/setup/doctype/brand/brand.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/setup/doctype/brand/brand.py b/setup/doctype/brand/brand.py index 77944303490..8002652c6c0 100644 --- a/setup/doctype/brand/brand.py +++ b/setup/doctype/brand/brand.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/brand/test_brand.py b/setup/doctype/brand/test_brand.py index 7a18c2ebb2a..b97f6b065ca 100644 --- a/setup/doctype/brand/test_brand.py +++ b/setup/doctype/brand/test_brand.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Brand", diff --git a/setup/doctype/company/charts/import_from_openerp.py b/setup/doctype/company/charts/import_from_openerp.py index ebf8d0da5df..894c2d739d8 100644 --- a/setup/doctype/company/charts/import_from_openerp.py +++ b/setup/doctype/company/charts/import_from_openerp.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + """ Import chart of accounts from OpenERP sources """ diff --git a/setup/doctype/company/company.js b/setup/doctype/company/company.js index 1d3aa5f9f29..40e314c1812 100644 --- a/setup/doctype/company/company.js +++ b/setup/doctype/company/company.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.abbr && !doc.__islocal) diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py index ee432c00e42..66c83d69338 100644 --- a/setup/doctype/company/company.py +++ b/setup/doctype/company/company.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt index d698624e684..e1478436dc3 100644 --- a/setup/doctype/company/company.txt +++ b/setup/doctype/company/company.txt @@ -164,15 +164,7 @@ "width": "50%" }, { - "depends_on": "eval:!doc.__islocal", - "doctype": "DocField", - "fieldname": "cost_center", - "fieldtype": "Link", - "label": "Cost Center", - "no_copy": 1, - "options": "Cost Center" - }, - { + "description": "To enable more currencies go to Setup > Currency", "doctype": "DocField", "fieldname": "default_currency", "fieldtype": "Link", @@ -181,6 +173,15 @@ "read_only": 0, "reqd": 1 }, + { + "depends_on": "eval:!doc.__islocal", + "doctype": "DocField", + "fieldname": "cost_center", + "fieldtype": "Link", + "label": "Cost Center", + "no_copy": 1, + "options": "Cost Center" + }, { "depends_on": "eval:!doc.__islocal", "doctype": "DocField", diff --git a/setup/doctype/company/test_company.py b/setup/doctype/company/test_company.py index e89731fe11e..915657cfc99 100644 --- a/setup/doctype/company/test_company.py +++ b/setup/doctype/company/test_company.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_ignore = ["Account", "Cost Center"] test_records = [ diff --git a/setup/doctype/contact_control/contact_control.js b/setup/doctype/contact_control/contact_control.js index 5c8e571ca99..6c3f17d8339 100755 --- a/setup/doctype/contact_control/contact_control.js +++ b/setup/doctype/contact_control/contact_control.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // common partner functions // ========================= diff --git a/setup/doctype/contact_control/contact_control.py b/setup/doctype/contact_control/contact_control.py index 54a2fccf226..409c6635ac6 100644 --- a/setup/doctype/contact_control/contact_control.py +++ b/setup/doctype/contact_control/contact_control.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/country/country.py b/setup/doctype/country/country.py index 77944303490..8002652c6c0 100644 --- a/setup/doctype/country/country.py +++ b/setup/doctype/country/country.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/country/test_country.py b/setup/doctype/country/test_country.py index c42e80fe1b8..c2caa3c73cc 100644 --- a/setup/doctype/country/test_country.py +++ b/setup/doctype/country/test_country.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Country", diff --git a/setup/doctype/currency/currency.js b/setup/doctype/currency/currency.js index cc0aeb6c8e2..58697b08f21 100644 --- a/setup/doctype/currency/currency.js +++ b/setup/doctype/currency/currency.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + cur_frm.cscript.refresh = function(doc) { cur_frm.set_intro(""); if(!cur_frm.doc.enabled) { diff --git a/setup/doctype/currency/currency.py b/setup/doctype/currency/currency.py index 7f48feb2ebf..26d0f769688 100644 --- a/setup/doctype/currency/currency.py +++ b/setup/doctype/currency/currency.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/currency/test_currency.py b/setup/doctype/currency/test_currency.py index 71963f91f60..a7ae97b72df 100644 --- a/setup/doctype/currency/test_currency.py +++ b/setup/doctype/currency/test_currency.py @@ -1,2 +1,5 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # pre loaded test_records = [] \ No newline at end of file diff --git a/setup/doctype/currency_exchange/currency_exchange.js b/setup/doctype/currency_exchange/currency_exchange.js index f10bdf01ffe..5fd43050dfe 100644 --- a/setup/doctype/currency_exchange/currency_exchange.js +++ b/setup/doctype/currency_exchange/currency_exchange.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt $.extend(cur_frm.cscript, { onload: function() { diff --git a/setup/doctype/currency_exchange/currency_exchange.py b/setup/doctype/currency_exchange/currency_exchange.py index f1ff49ed930..2a530170b2e 100644 --- a/setup/doctype/currency_exchange/currency_exchange.py +++ b/setup/doctype/currency_exchange/currency_exchange.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/setup/doctype/currency_exchange/test_currency_exchange.py b/setup/doctype/currency_exchange/test_currency_exchange.py index 542b6affee2..ea851b4ca5a 100644 --- a/setup/doctype/currency_exchange/test_currency_exchange.py +++ b/setup/doctype/currency_exchange/test_currency_exchange.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Currency Exchange", diff --git a/setup/doctype/customer_group/customer_group.js b/setup/doctype/customer_group/customer_group.js index e865860a249..2953de542d5 100644 --- a/setup/doctype/customer_group/customer_group.js +++ b/setup/doctype/customer_group/customer_group.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.set_root_readonly(doc); diff --git a/setup/doctype/customer_group/customer_group.py b/setup/doctype/customer_group/customer_group.py index de0042ec59b..0940e1f0b3c 100644 --- a/setup/doctype/customer_group/customer_group.py +++ b/setup/doctype/customer_group/customer_group.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -37,6 +24,7 @@ class DocType(DocTypeNestedSet): def on_update(self): self.validate_name_with_customer() super(DocType, self).on_update() + self.validate_one_root() def validate_name_with_customer(self): if webnotes.conn.exists("Customer", self.doc.name): diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt index 6a1350046e7..4f9acc64325 100644 --- a/setup/doctype/customer_group/customer_group.txt +++ b/setup/doctype/customer_group/customer_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:23", "docstatus": 0, - "modified": "2013-07-05 14:34:20", + "modified": "2013-08-05 18:12:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -69,7 +69,7 @@ "oldfieldname": "parent_customer_group", "oldfieldtype": "Link", "options": "Customer Group", - "reqd": 1 + "reqd": 0 }, { "description": "Only leaf nodes are allowed in transaction", diff --git a/setup/doctype/customer_group/test_customer_group.py b/setup/doctype/customer_group/test_customer_group.py index 7670824692c..14233af82e3 100644 --- a/setup/doctype/customer_group/test_customer_group.py +++ b/setup/doctype/customer_group/test_customer_group.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Customer Group", diff --git a/setup/doctype/email_digest/email_digest.js b/setup/doctype/email_digest/email_digest.js index 011718f5c55..552109231fb 100644 --- a/setup/doctype/email_digest/email_digest.js +++ b/setup/doctype/email_digest/email_digest.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc, dt, dn) { doc = locals[dt][dn]; diff --git a/setup/doctype/email_digest/email_digest.py b/setup/doctype/email_digest/email_digest.py index 0354b50930e..39e377a6014 100644 --- a/setup/doctype/email_digest/email_digest.py +++ b/setup/doctype/email_digest/email_digest.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/email_settings/email_settings.py b/setup/doctype/email_settings/email_settings.py index b9880d2fbf2..219501eb13f 100644 --- a/setup/doctype/email_settings/email_settings.py +++ b/setup/doctype/email_settings/email_settings.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/features_setup/features_setup.py b/setup/doctype/features_setup/features_setup.py index 50b253585cf..3ecefca9378 100644 --- a/setup/doctype/features_setup/features_setup.py +++ b/setup/doctype/features_setup/features_setup.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals class DocType: diff --git a/setup/doctype/for_territory/for_territory.py b/setup/doctype/for_territory/for_territory.py index 928aa9ff9f2..784339de7db 100644 --- a/setup/doctype/for_territory/for_territory.py +++ b/setup/doctype/for_territory/for_territory.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/setup/doctype/global_defaults/global_defaults.js b/setup/doctype/global_defaults/global_defaults.js index f629ee0d6a1..39999795a17 100644 --- a/setup/doctype/global_defaults/global_defaults.js +++ b/setup/doctype/global_defaults/global_defaults.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Validate cur_frm.cscript.validate = function(doc, cdt, cdn) { diff --git a/setup/doctype/global_defaults/global_defaults.py b/setup/doctype/global_defaults/global_defaults.py index 7b0c2779004..1b1d50c2ffe 100644 --- a/setup/doctype/global_defaults/global_defaults.py +++ b/setup/doctype/global_defaults/global_defaults.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals """Global Defaults""" diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt index b59ca94c258..fbfa8ca14df 100644 --- a/setup/doctype/global_defaults/global_defaults.txt +++ b/setup/doctype/global_defaults/global_defaults.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-02 17:53:24", "docstatus": 0, - "modified": "2013-07-15 15:03:01", + "modified": "2013-08-06 11:22:22", "modified_by": "Administrator", "owner": "Administrator" }, @@ -71,7 +71,8 @@ "read_only": 0 }, { - "description": "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.", + "default": "3", + "description": "Precision for Float fields (quantities, discounts, percentages etc). Floats will be rounded up to specified decimals. Default = 3", "doctype": "DocField", "fieldname": "float_precision", "fieldtype": "Select", @@ -181,15 +182,6 @@ "label": "HR", "read_only": 0 }, - { - "description": "Employee record is created using selected field. ", - "doctype": "DocField", - "fieldname": "emp_created_by", - "fieldtype": "Select", - "label": "Employee Records to be created by ", - "options": "Naming Series\nEmployee Number", - "read_only": 0 - }, { "doctype": "DocPerm" } diff --git a/setup/doctype/item_group/item_group.js b/setup/doctype/item_group/item_group.js index f672e7a832a..31edef27dec 100644 --- a/setup/doctype/item_group/item_group.js +++ b/setup/doctype/item_group/item_group.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc, cdt, cdn) { diff --git a/setup/doctype/item_group/item_group.py b/setup/doctype/item_group/item_group.py index ef3c4080282..81f69035163 100644 --- a/setup/doctype/item_group/item_group.py +++ b/setup/doctype/item_group/item_group.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -33,7 +20,6 @@ class DocType(DocTypeNestedSet): from website.helpers.product import invalidate_cache_for - if self.doc.show_in_website: from webnotes.webutils import update_page_name # webpage updates @@ -51,6 +37,8 @@ class DocType(DocTypeNestedSet): webnotes.conn.set(self.doc, "page_name", None) + self.validate_one_root() + def validate_name_with_item(self): if webnotes.conn.exists("Item", self.doc.name): webnotes.msgprint("An item exists with same name (%s), please change the \ diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt index 6e7edf952b8..f573110330f 100644 --- a/setup/doctype/item_group/item_group.txt +++ b/setup/doctype/item_group/item_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:29", "docstatus": 0, - "modified": "2013-07-23 12:00:14", + "modified": "2013-08-05 17:21:14", "modified_by": "Administrator", "owner": "Administrator" }, @@ -75,7 +75,7 @@ "oldfieldname": "parent_item_group", "oldfieldtype": "Link", "options": "Item Group", - "reqd": 1, + "reqd": 0, "search_index": 0 }, { diff --git a/setup/doctype/item_group/test_item_group.py b/setup/doctype/item_group/test_item_group.py index 924b3671f5e..7d7452e310d 100644 --- a/setup/doctype/item_group/test_item_group.py +++ b/setup/doctype/item_group/test_item_group.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Item Group", diff --git a/setup/doctype/jobs_email_settings/jobs_email_settings.js b/setup/doctype/jobs_email_settings/jobs_email_settings.js index 0a75b89360b..b970c969f01 100644 --- a/setup/doctype/jobs_email_settings/jobs_email_settings.js +++ b/setup/doctype/jobs_email_settings/jobs_email_settings.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // For license information, please see license.txt cur_frm.cscript = { diff --git a/setup/doctype/jobs_email_settings/jobs_email_settings.py b/setup/doctype/jobs_email_settings/jobs_email_settings.py index b09cefd5e2a..87ed621035e 100644 --- a/setup/doctype/jobs_email_settings/jobs_email_settings.py +++ b/setup/doctype/jobs_email_settings/jobs_email_settings.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/setup/doctype/naming_series/naming_series.js b/setup/doctype/naming_series/naming_series.js index 663b08f3805..885b5ed6539 100644 --- a/setup/doctype/naming_series/naming_series.js +++ b/setup/doctype/naming_series/naming_series.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Settings cur_frm.cscript.onload_post_render = function(doc, cdt, cdn){ diff --git a/setup/doctype/naming_series/naming_series.py b/setup/doctype/naming_series/naming_series.py index eb293f256b1..c9604fc9490 100644 --- a/setup/doctype/naming_series/naming_series.py +++ b/setup/doctype/naming_series/naming_series.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/notification_control/notification_control.js b/setup/doctype/notification_control/notification_control.js index 279f5b47f03..3e16421c6f4 100644 --- a/setup/doctype/notification_control/notification_control.js +++ b/setup/doctype/notification_control/notification_control.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.select_transaction = function(doc, cdt, cdn) { if(doc.select_transaction) { diff --git a/setup/doctype/notification_control/notification_control.py b/setup/doctype/notification_control/notification_control.py index d6792f9e30c..6133d9b7019 100644 --- a/setup/doctype/notification_control/notification_control.py +++ b/setup/doctype/notification_control/notification_control.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/price_list/price_list.js b/setup/doctype/price_list/price_list.js index 26c98545924..d11c4bacf95 100644 --- a/setup/doctype/price_list/price_list.js +++ b/setup/doctype/price_list/price_list.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt $.extend(cur_frm.cscript, { onload: function() { diff --git a/setup/doctype/price_list/price_list.py b/setup/doctype/price_list/price_list.py index 051f54a3236..2a44e7bc0c2 100644 --- a/setup/doctype/price_list/price_list.py +++ b/setup/doctype/price_list/price_list.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/price_list/test_price_list.py b/setup/doctype/price_list/test_price_list.py index c3633e78ec3..bfa64ec6d6c 100644 --- a/setup/doctype/price_list/test_price_list.py +++ b/setup/doctype/price_list/test_price_list.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [ { diff --git a/setup/doctype/print_heading/print_heading.js b/setup/doctype/print_heading/print_heading.js index 3cad9447a9b..e8c3c69c7fb 100644 --- a/setup/doctype/print_heading/print_heading.js +++ b/setup/doctype/print_heading/print_heading.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/setup/doctype/print_heading/print_heading.py b/setup/doctype/print_heading/print_heading.py index d856eb43bc1..ba7114a22d9 100644 --- a/setup/doctype/print_heading/print_heading.py +++ b/setup/doctype/print_heading/print_heading.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/print_heading/test_print_heading.py b/setup/doctype/print_heading/test_print_heading.py index d2ef7c3f7b7..927ac66cdc6 100644 --- a/setup/doctype/print_heading/test_print_heading.py +++ b/setup/doctype/print_heading/test_print_heading.py @@ -1 +1,4 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{"print_heading": "_Test Print Heading"}]] \ No newline at end of file diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.js b/setup/doctype/quotation_lost_reason/quotation_lost_reason.js index 3cad9447a9b..e8c3c69c7fb 100644 --- a/setup/doctype/quotation_lost_reason/quotation_lost_reason.js +++ b/setup/doctype/quotation_lost_reason/quotation_lost_reason.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.py b/setup/doctype/quotation_lost_reason/quotation_lost_reason.py index 77944303490..8002652c6c0 100644 --- a/setup/doctype/quotation_lost_reason/quotation_lost_reason.py +++ b/setup/doctype/quotation_lost_reason/quotation_lost_reason.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py b/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py index 9e982046ea6..4b2bc176bd5 100644 --- a/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py +++ b/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py @@ -1 +1,4 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{"doctype":"Quotation Lost Reason", "order_lost_reason": "_Test Quotation Lost Reason"}]] \ No newline at end of file diff --git a/setup/doctype/sales_email_settings/sales_email_settings.js b/setup/doctype/sales_email_settings/sales_email_settings.js index 0a75b89360b..b970c969f01 100644 --- a/setup/doctype/sales_email_settings/sales_email_settings.js +++ b/setup/doctype/sales_email_settings/sales_email_settings.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // For license information, please see license.txt cur_frm.cscript = { diff --git a/setup/doctype/sales_email_settings/sales_email_settings.py b/setup/doctype/sales_email_settings/sales_email_settings.py index b09cefd5e2a..87ed621035e 100644 --- a/setup/doctype/sales_email_settings/sales_email_settings.py +++ b/setup/doctype/sales_email_settings/sales_email_settings.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/setup/doctype/sales_partner/sales_partner.js b/setup/doctype/sales_partner/sales_partner.js index acf6b312bdc..86b77121421 100644 --- a/setup/doctype/sales_partner/sales_partner.js +++ b/setup/doctype/sales_partner/sales_partner.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require('app/setup/doctype/contact_control/contact_control.js'); diff --git a/setup/doctype/sales_partner/sales_partner.py b/setup/doctype/sales_partner/sales_partner.py index dc46b20e177..2c39e67bead 100644 --- a/setup/doctype/sales_partner/sales_partner.py +++ b/setup/doctype/sales_partner/sales_partner.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/sales_partner/test_sales_partner.py b/setup/doctype/sales_partner/test_sales_partner.py index 3afb472baef..7ac835db7d8 100644 --- a/setup/doctype/sales_partner/test_sales_partner.py +++ b/setup/doctype/sales_partner/test_sales_partner.py @@ -1 +1,4 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [] \ No newline at end of file diff --git a/setup/doctype/sales_person/sales_person.js b/setup/doctype/sales_person/sales_person.js index fd03a441ee0..34f267e825d 100644 --- a/setup/doctype/sales_person/sales_person.js +++ b/setup/doctype/sales_person/sales_person.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.set_root_readonly(doc); diff --git a/setup/doctype/sales_person/sales_person.py b/setup/doctype/sales_person/sales_person.py index 2fe08fa711e..6161706f5d0 100644 --- a/setup/doctype/sales_person/sales_person.py +++ b/setup/doctype/sales_person/sales_person.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -34,6 +21,10 @@ class DocType(DocTypeNestedSet): webnotes.msgprint("Either target qty or target amount is mandatory.") raise Exception + def on_update(self): + super(DocType, self).on_update() + self.validate_one_root() + def get_email_id(self): profile = webnotes.conn.get_value("Employee", self.doc.employee, "user_id") if not profile: diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt index 56c6397454d..77ba6afd4ea 100644 --- a/setup/doctype/sales_person/sales_person.txt +++ b/setup/doctype/sales_person/sales_person.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-07-10 12:51:58", + "modified": "2013-08-05 18:11:22", "modified_by": "Administrator", "owner": "Administrator" }, @@ -69,7 +69,7 @@ "oldfieldname": "parent_sales_person", "oldfieldtype": "Link", "options": "Sales Person", - "reqd": 1 + "reqd": 0 }, { "doctype": "DocField", diff --git a/setup/doctype/sales_person/test_sales_person.py b/setup/doctype/sales_person/test_sales_person.py index 86a268fdcbe..d00736b3993 100644 --- a/setup/doctype/sales_person/test_sales_person.py +++ b/setup/doctype/sales_person/test_sales_person.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_dependencies = ["Employee"] test_records = [ [{ diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py index 32b76387cda..2dd16465a0e 100644 --- a/setup/doctype/setup_control/setup_control.py +++ b/setup/doctype/setup_control/setup_control.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/sms_parameter/sms_parameter.py b/setup/doctype/sms_parameter/sms_parameter.py index 7f48feb2ebf..26d0f769688 100644 --- a/setup/doctype/sms_parameter/sms_parameter.py +++ b/setup/doctype/sms_parameter/sms_parameter.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/sms_settings/sms_settings.py b/setup/doctype/sms_settings/sms_settings.py index 7f48feb2ebf..26d0f769688 100644 --- a/setup/doctype/sms_settings/sms_settings.py +++ b/setup/doctype/sms_settings/sms_settings.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/supplier_type/supplier_type.js b/setup/doctype/supplier_type/supplier_type.js index 945dec0823b..b65f67c21ca 100644 --- a/setup/doctype/supplier_type/supplier_type.js +++ b/setup/doctype/supplier_type/supplier_type.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc) { cur_frm.set_intro(doc.__islocal ? "" : "There is nothing to edit.") diff --git a/setup/doctype/supplier_type/supplier_type.py b/setup/doctype/supplier_type/supplier_type.py index 77944303490..8002652c6c0 100644 --- a/setup/doctype/supplier_type/supplier_type.py +++ b/setup/doctype/supplier_type/supplier_type.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/supplier_type/test_supplier_type.py b/setup/doctype/supplier_type/test_supplier_type.py index 74dde9735d9..cb6a8b7ab86 100644 --- a/setup/doctype/supplier_type/test_supplier_type.py +++ b/setup/doctype/supplier_type/test_supplier_type.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Supplier Type", diff --git a/setup/doctype/target_detail/target_detail.py b/setup/doctype/target_detail/target_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/setup/doctype/target_detail/target_detail.py +++ b/setup/doctype/target_detail/target_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.js b/setup/doctype/terms_and_conditions/terms_and_conditions.js index 3cad9447a9b..e8c3c69c7fb 100644 --- a/setup/doctype/terms_and_conditions/terms_and_conditions.js +++ b/setup/doctype/terms_and_conditions/terms_and_conditions.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.py b/setup/doctype/terms_and_conditions/terms_and_conditions.py index 7f48feb2ebf..26d0f769688 100644 --- a/setup/doctype/terms_and_conditions/terms_and_conditions.py +++ b/setup/doctype/terms_and_conditions/terms_and_conditions.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/doctype/terms_and_conditions/test_terms_and_conditions.py b/setup/doctype/terms_and_conditions/test_terms_and_conditions.py index b0d1feeca11..268e9e0b0d0 100644 --- a/setup/doctype/terms_and_conditions/test_terms_and_conditions.py +++ b/setup/doctype/terms_and_conditions/test_terms_and_conditions.py @@ -1 +1,4 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [[{"title": "_Test Terms and Conditions", "terms": "_Test Terms"}]] \ No newline at end of file diff --git a/setup/doctype/territory/territory.js b/setup/doctype/territory/territory.js index 7fdfee54d62..75618161854 100644 --- a/setup/doctype/territory/territory.js +++ b/setup/doctype/territory/territory.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.set_root_readonly(doc); diff --git a/setup/doctype/territory/territory.py b/setup/doctype/territory/territory.py index 896d5c77b31..13498fc310a 100644 --- a/setup/doctype/territory/territory.py +++ b/setup/doctype/territory/territory.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -33,4 +20,7 @@ class DocType(DocTypeNestedSet): if not flt(d.target_qty) and not flt(d.target_amount): msgprint("Either target qty or target amount is mandatory.") raise Exception - \ No newline at end of file + + def on_update(self): + super(DocType, self).on_update() + self.validate_one_root() diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt index bba7e3ead3f..b647e7b7128 100644 --- a/setup/doctype/territory/territory.txt +++ b/setup/doctype/territory/territory.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-07-05 14:58:15", + "modified": "2013-08-05 18:12:29", "modified_by": "Administrator", "owner": "Administrator" }, @@ -71,7 +71,7 @@ "oldfieldname": "parent_territory", "oldfieldtype": "Link", "options": "Territory", - "reqd": 1 + "reqd": 0 }, { "description": "Only leaf nodes are allowed in transaction", diff --git a/setup/doctype/territory/test_territory.py b/setup/doctype/territory/test_territory.py index 75003f2b56c..1ebcc1e9f9f 100644 --- a/setup/doctype/territory/test_territory.py +++ b/setup/doctype/territory/test_territory.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Territory", diff --git a/setup/doctype/uom/test_uom.py b/setup/doctype/uom/test_uom.py index 7dbb28c5026..044cc11c567 100644 --- a/setup/doctype/uom/test_uom.py +++ b/setup/doctype/uom/test_uom.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "UOM", diff --git a/setup/doctype/uom/uom.js b/setup/doctype/uom/uom.js index 3cad9447a9b..e8c3c69c7fb 100644 --- a/setup/doctype/uom/uom.js +++ b/setup/doctype/uom/uom.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt diff --git a/setup/doctype/uom/uom.py b/setup/doctype/uom/uom.py index 77944303490..8002652c6c0 100644 --- a/setup/doctype/uom/uom.py +++ b/setup/doctype/uom/uom.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index 40b67d86cb6..c9532e2f941 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.pages['Setup'].onload = function(wrapper) { if(msg_dialog && msg_dialog.display) msg_dialog.hide(); wn.ui.make_app_page({ diff --git a/setup/page/setup/setup.py b/setup/page/setup/setup.py index 4bb1a20d64d..6e6be3102bd 100644 --- a/setup/page/setup/setup.py +++ b/setup/page/setup/setup.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/setup/utils.py b/setup/utils.py index adfa4f7fbb3..b0aa8897e98 100644 --- a/setup/utils.py +++ b/setup/utils.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/startup/boot.py b/startup/boot.py index a75c78ad5af..79f0a7bd04a 100644 --- a/startup/boot.py +++ b/startup/boot.py @@ -1,5 +1,5 @@ -# ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -# GNU General Public License. See "license.txt" +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt" from __future__ import unicode_literals diff --git a/startup/event_handlers.py b/startup/event_handlers.py index d19f9e6a1c4..e807797a325 100644 --- a/startup/event_handlers.py +++ b/startup/event_handlers.py @@ -1,5 +1,5 @@ -# ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -# GNU General Public License. See "license.txt" +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt" from __future__ import unicode_literals diff --git a/startup/install.py b/startup/install.py index 9408c6177cc..0824c6ca781 100644 --- a/startup/install.py +++ b/startup/install.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals import webnotes diff --git a/startup/observers.py b/startup/observers.py index 89980e4fc35..df827daf9dd 100644 --- a/startup/observers.py +++ b/startup/observers.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt observer_map = { "*:on_update": "home.update_feed", diff --git a/startup/open_count.py b/startup/open_count.py index 04e00297b12..431ced95e16 100644 --- a/startup/open_count.py +++ b/startup/open_count.py @@ -1,5 +1,5 @@ -# ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -# GNU General Public Licnese. See "license.txt" +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/startup/query_handlers.py b/startup/query_handlers.py index eb5f99ec5c3..56c995e204f 100644 --- a/startup/query_handlers.py +++ b/startup/query_handlers.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + from __future__ import unicode_literals standard_queries = { diff --git a/startup/report_data_map.py b/startup/report_data_map.py index c3a5dd2cce9..0f6d4fe1940 100644 --- a/startup/report_data_map.py +++ b/startup/report_data_map.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/startup/schedule_handlers.py b/startup/schedule_handlers.py index 28ff2aef1ef..15bedd24f50 100644 --- a/startup/schedule_handlers.py +++ b/startup/schedule_handlers.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals """will be called by scheduler""" diff --git a/startup/webutils.py b/startup/webutils.py index 87d12e4ec25..eab4948dd34 100644 --- a/startup/webutils.py +++ b/startup/webutils.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, conf, os from webnotes.utils import cint, cstr, encode diff --git a/stock/doctype/batch/batch.js b/stock/doctype/batch/batch.js index 8b26d548cd6..ac83b71a17f 100644 --- a/stock/doctype/batch/batch.js +++ b/stock/doctype/batch/batch.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.fields_dict['item'].get_query = function(doc, cdt, cdn) { return { diff --git a/stock/doctype/batch/batch.py b/stock/doctype/batch/batch.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/batch/batch.py +++ b/stock/doctype/batch/batch.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/bin/bin.py b/stock/doctype/bin/bin.py index cf30c5a7429..146191f9b15 100644 --- a/stock/doctype/bin/bin.py +++ b/stock/doctype/bin/bin.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index ca0d8c8a316..eaaf9ea0518 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt // Module Material Management cur_frm.cscript.tname = "Delivery Note Item"; diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py index d55f6221265..71d3ad63924 100644 --- a/stock/doctype/delivery_note/delivery_note.py +++ b/stock/doctype/delivery_note/delivery_note.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -85,7 +72,7 @@ class DocType(SellingController): def so_required(self): """check in manage account if sales order required or not""" - if webnotes.conn.get_single_value("Selling Settings", 'so_required') == 'Yes': + if webnotes.conn.get_value("Selling Settings", None, 'so_required') == 'Yes': for d in getlist(self.doclist,'delivery_note_details'): if not d.prevdoc_docname: msgprint("Sales Order No. required against item %s"%d.item_code) @@ -301,6 +288,9 @@ class DocType(SellingController): and d.warehouse: if d['reserved_qty'] < 0 : # Reduce reserved qty from reserved warehouse mentioned in so + if not d["reserved_warehouse"]: + webnotes.throw(_("Reserved Warehouse is missing in Sales Order")) + args = { "item_code": d['item_code'], "voucher_type": self.doc.doctype, diff --git a/stock/doctype/delivery_note/test_delivery_note.py b/stock/doctype/delivery_note/test_delivery_note.py index e1b17752378..3f7c753707b 100644 --- a/stock/doctype/delivery_note/test_delivery_note.py +++ b/stock/doctype/delivery_note/test_delivery_note.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/stock/doctype/delivery_note_item/delivery_note_item.py b/stock/doctype/delivery_note_item/delivery_note_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/delivery_note_item/delivery_note_item.py +++ b/stock/doctype/delivery_note_item/delivery_note_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.py b/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.py +++ b/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js index a8401c41eb9..7f433804edc 100644 --- a/stock/doctype/item/item.js +++ b/stock/doctype/item/item.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.stock"); diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index 4a4cd894402..cd70117c1ad 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index 3e41101413c..acaed7ea17c 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-03 10:45:46", "docstatus": 0, - "modified": "2013-07-26 16:26:15", + "modified": "2013-08-05 18:23:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -35,9 +35,7 @@ "parentfield": "permissions", "parenttype": "DocType", "permlevel": 0, - "read": 1, - "report": 1, - "submit": 0 + "read": 1 }, { "doctype": "DocType", @@ -593,17 +591,6 @@ "options": "Cost Center", "read_only": 0 }, - { - "depends_on": "eval:doc.is_sales_item==\"Yes\"", - "doctype": "DocField", - "fieldname": "sales_rate", - "fieldtype": "Float", - "hidden": 1, - "label": "Sales Rate", - "oldfieldname": "sales_rate", - "oldfieldtype": "Currency", - "read_only": 0 - }, { "depends_on": "eval:doc.is_sales_item==\"Yes\"", "doctype": "DocField", @@ -883,7 +870,9 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", + "report": 1, "role": "Material Master Manager", + "submit": 0, "write": 1 }, { @@ -891,7 +880,9 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "report": 1, "role": "Material Manager", + "submit": 0, "write": 0 }, { @@ -899,7 +890,21 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", + "report": 1, "role": "Material User", + "submit": 0, "write": 0 + }, + { + "doctype": "DocPerm", + "role": "Sales User" + }, + { + "doctype": "DocPerm", + "role": "Purchase User" + }, + { + "doctype": "DocPerm", + "role": "Accounts User" } ] \ No newline at end of file diff --git a/stock/doctype/item/test_item.py b/stock/doctype/item/test_item.py index 0ea8a5d3988..c28ba4fd2ff 100644 --- a/stock/doctype/item/test_item.py +++ b/stock/doctype/item/test_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import unittest diff --git a/stock/doctype/item_customer_detail/item_customer_detail.py b/stock/doctype/item_customer_detail/item_customer_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/item_customer_detail/item_customer_detail.py +++ b/stock/doctype/item_customer_detail/item_customer_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/item_price/item_price.py b/stock/doctype/item_price/item_price.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/item_price/item_price.py +++ b/stock/doctype/item_price/item_price.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.py b/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.py +++ b/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/item_reorder/item_reorder.py b/stock/doctype/item_reorder/item_reorder.py index 928aa9ff9f2..784339de7db 100644 --- a/stock/doctype/item_reorder/item_reorder.py +++ b/stock/doctype/item_reorder/item_reorder.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/stock/doctype/item_supplier/item_supplier.py b/stock/doctype/item_supplier/item_supplier.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/item_supplier/item_supplier.py +++ b/stock/doctype/item_supplier/item_supplier.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/item_tax/item_tax.py b/stock/doctype/item_tax/item_tax.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/item_tax/item_tax.py +++ b/stock/doctype/item_tax/item_tax.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/item_website_specification/item_website_specification.py b/stock/doctype/item_website_specification/item_website_specification.py index 928aa9ff9f2..784339de7db 100644 --- a/stock/doctype/item_website_specification/item_website_specification.py +++ b/stock/doctype/item_website_specification/item_website_specification.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/stock/doctype/landed_cost_item/landed_cost_item.py b/stock/doctype/landed_cost_item/landed_cost_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/landed_cost_item/landed_cost_item.py +++ b/stock/doctype/landed_cost_item/landed_cost_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.py b/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.py +++ b/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.js b/stock/doctype/landed_cost_wizard/landed_cost_wizard.js index a093d6f2640..06f3fd6ae6b 100644 --- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.js +++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.onload = function(doc, cdt, cdn) { if(!doc.currency){doc.currency = sys_defaults.currency;} diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py index e5fd12ca624..0cdad4d949a 100644 --- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py +++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/material_request/material_request.js b/stock/doctype/material_request/material_request.js index fe9af31e247..6931181dbac 100644 --- a/stock/doctype/material_request/material_request.js +++ b/stock/doctype/material_request/material_request.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.tname = "Material Request Item"; cur_frm.cscript.fname = "indent_details"; diff --git a/stock/doctype/material_request/material_request.py b/stock/doctype/material_request/material_request.py index 5bcbaf8bc58..4952834bfc7 100644 --- a/stock/doctype/material_request/material_request.py +++ b/stock/doctype/material_request/material_request.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # ERPNext - web based ERP (http://erpnext.com) # For license information, please see license.txt diff --git a/stock/doctype/material_request/test_material_request.py b/stock/doctype/material_request/test_material_request.py index a6576d02133..1040d647a70 100644 --- a/stock/doctype/material_request/test_material_request.py +++ b/stock/doctype/material_request/test_material_request.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # ERPNext - web based ERP (http://erpnext.com) # For license information, please see license.txt @@ -84,9 +87,9 @@ class TestMaterialRequest(unittest.TestCase): "parentfield": "mtn_details", "incoming_rate": 100, "qty": qty1, - "stock_uom": "_Test UOM", + "stock_uom": "_Test UOM 1", "transfer_qty": qty1, - "uom": "_Test UOM", + "uom": "_Test UOM 1", "t_warehouse": "_Test Warehouse 1 - _TC", }, { @@ -96,9 +99,9 @@ class TestMaterialRequest(unittest.TestCase): "parentfield": "mtn_details", "incoming_rate": 100, "qty": qty2, - "stock_uom": "_Test UOM", + "stock_uom": "_Test UOM 1", "transfer_qty": qty2, - "uom": "_Test UOM", + "uom": "_Test UOM 1", "t_warehouse": "_Test Warehouse 1 - _TC", }, ]) @@ -316,7 +319,8 @@ class TestMaterialRequest(unittest.TestCase): mr = webnotes.bean(copy=test_records[0]) mr.doc.company = "_Test Company 1" self.assertRaises(WrongWarehouseCompany, mr.insert) - + +test_dependencies = ["Currency Exchange"] test_records = [ [ { @@ -335,7 +339,7 @@ test_records = [ "parentfield": "indent_details", "qty": 54.0, "schedule_date": "2013-02-18", - "uom": "_Test UOM", + "uom": "_Test UOM 1", "warehouse": "_Test Warehouse - _TC" }, { @@ -346,7 +350,7 @@ test_records = [ "parentfield": "indent_details", "qty": 3.0, "schedule_date": "2013-02-19", - "uom": "_Test UOM", + "uom": "_Test UOM 1", "warehouse": "_Test Warehouse - _TC" } ], diff --git a/stock/doctype/material_request_item/material_request_item.py b/stock/doctype/material_request_item/material_request_item.py index 928aa9ff9f2..784339de7db 100644 --- a/stock/doctype/material_request_item/material_request_item.py +++ b/stock/doctype/material_request_item/material_request_item.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/stock/doctype/packing_slip/packing_slip.js b/stock/doctype/packing_slip/packing_slip.js index d86d64b6c62..f3634f6a2dc 100644 --- a/stock/doctype/packing_slip/packing_slip.js +++ b/stock/doctype/packing_slip/packing_slip.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.fields_dict['delivery_note'].get_query = function(doc, cdt, cdn) { return{ diff --git a/stock/doctype/packing_slip/packing_slip.py b/stock/doctype/packing_slip/packing_slip.py index 9a0da823db5..50cdab99cfc 100644 --- a/stock/doctype/packing_slip/packing_slip.py +++ b/stock/doctype/packing_slip/packing_slip.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/packing_slip_item/packing_slip_item.py b/stock/doctype/packing_slip_item/packing_slip_item.py index 928aa9ff9f2..784339de7db 100644 --- a/stock/doctype/packing_slip_item/packing_slip_item.py +++ b/stock/doctype/packing_slip_item/packing_slip_item.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js index b393907bee2..bdf50ee6694 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/stock/doctype/purchase_receipt/purchase_receipt.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.tname = "Purchase Receipt Item"; cur_frm.cscript.fname = "purchase_receipt_details"; diff --git a/stock/doctype/purchase_receipt/purchase_receipt.py b/stock/doctype/purchase_receipt/purchase_receipt.py index 95682b51309..a50802d4fd9 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/stock/doctype/purchase_receipt/purchase_receipt.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -118,7 +105,7 @@ class DocType(BuyingController): def po_required(self): - if webnotes.conn.get_single_value("Buying Settings", "po_required") == 'Yes': + if webnotes.conn.get_value("Buying Settings", None, "po_required") == 'Yes': for d in getlist(self.doclist,'purchase_receipt_details'): if not d.prevdoc_docname: msgprint("Purchse Order No. required against item %s"%d.item_code) diff --git a/stock/doctype/purchase_receipt/purchase_receipt_list.js b/stock/doctype/purchase_receipt/purchase_receipt_list.js index c80f6aedc7e..bc0c9f6e00a 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt_list.js +++ b/stock/doctype/purchase_receipt/purchase_receipt_list.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + // render wn.listview_settings['Purchase Receipt'] = { add_fields: ["group_concat(`tabPurchase Receipt Item`.prevdoc_docname) \ diff --git a/stock/doctype/purchase_receipt/test_purchase_receipt.py b/stock/doctype/purchase_receipt/test_purchase_receipt.py index eb2ae54b8dc..987389fce56 100644 --- a/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.py b/stock/doctype/purchase_receipt_item/purchase_receipt_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.py +++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/serial_no/serial_no.js b/stock/doctype/serial_no/serial_no.js index 8e833d738f1..8d2f210c27a 100644 --- a/stock/doctype/serial_no/serial_no.js +++ b/stock/doctype/serial_no/serial_no.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.onload = function(doc, cdt, cdn) { if(!doc.status) set_multiple(cdt, cdn, {status:'In Store'}); diff --git a/stock/doctype/serial_no/serial_no.py b/stock/doctype/serial_no/serial_no.py index 0170c820542..1fdb58a42bd 100644 --- a/stock/doctype/serial_no/serial_no.py +++ b/stock/doctype/serial_no/serial_no.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -155,4 +142,4 @@ class DocType(StockController): from accounts.general_ledger import make_gl_entries make_gl_entries(gl_entries, cancel) self.sync_stock_account_balance([self.doc.warehouse], self.doc.cost_center, - posting_date) \ No newline at end of file + posting_date) diff --git a/stock/doctype/serial_no/test_serial_no.py b/stock/doctype/serial_no/test_serial_no.py index 837e337816f..4657ff261db 100644 --- a/stock/doctype/serial_no/test_serial_no.py +++ b/stock/doctype/serial_no/test_serial_no.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # ERPNext - web based ERP (http://erpnext.com) # For license information, please see license.txt diff --git a/stock/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js index efdbf320862..21829b9000e 100644 --- a/stock/doctype/stock_entry/stock_entry.js +++ b/stock/doctype/stock_entry/stock_entry.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require("public/app/js/controllers/stock_controller.js"); wn.provide("erpnext.stock"); diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py index 84cb0ea76ec..d739c3f88fe 100644 --- a/stock/doctype/stock_entry/stock_entry.py +++ b/stock/doctype/stock_entry/stock_entry.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -472,6 +459,7 @@ class DocType(StockController): def get_items(self): self.doclist = self.doc.clear_table(self.doclist, 'mtn_details', 1) + pro_obj = None if self.doc.production_order: # common validations pro_obj = get_obj('Production Order', self.doc.production_order) @@ -490,7 +478,8 @@ class DocType(StockController): else: item_dict = self.get_bom_raw_materials(self.doc.fg_completed_qty) for item in item_dict.values(): - item["from_warehouse"] = pro_obj.doc.wip_warehouse + if pro_obj: + item["from_warehouse"] = pro_obj.doc.wip_warehouse item["to_warehouse"] = "" # add raw materials to Stock Entry Detail table @@ -515,8 +504,12 @@ class DocType(StockController): item = webnotes.conn.sql("""select item, description, uom from `tabBOM` where name=%s""", (self.doc.bom_no,), as_dict=1) self.add_to_stock_entry_detail({ - item[0]["item"] : - [self.doc.fg_completed_qty, item[0]["description"], item[0]["uom"]] + item[0]["item"] : { + "qty": self.doc.fg_completed_qty, + "description": item[0]["description"], + "stock_uom": item[0]["uom"], + "from_warehouse": "" + } }, bom_no=self.doc.bom_no) self.get_stock_and_rate() @@ -638,7 +631,7 @@ class DocType(StockController): for d in item_dict: se_child = addchild(self.doc, 'mtn_details', 'Stock Entry Detail', self.doclist) - se_child.s_warehouse = item_dict[d].get("from_warehouse", self.doc.from_warehouse) + se_child.s_warehouse = item_dict[d].get("from_warehouse", self.doc.from_warehouse) se_child.t_warehouse = item_dict[d].get("to_warehouse", self.doc.to_warehouse) se_child.item_code = cstr(d) se_child.description = item_dict[d]["description"] diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index 7c9e4f92aa0..49f476555bd 100644 --- a/stock/doctype/stock_entry/stock_entry.txt +++ b/stock/doctype/stock_entry/stock_entry.txt @@ -306,11 +306,11 @@ "read_only": 0 }, { - "depends_on": "eval:(doc.purpose!==\"Sales Return\" || doc.purpose!==\"Purchase Return\")", + "depends_on": "eval:(doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")", "doctype": "DocField", "fieldname": "sb1", "fieldtype": "Section Break", - "label": "Reference", + "label": "From Bill of Materials", "read_only": 0 }, { diff --git a/stock/doctype/stock_entry/test_stock_entry.py b/stock/doctype/stock_entry/test_stock_entry.py index 870f0266997..93f76c38442 100644 --- a/stock/doctype/stock_entry/test_stock_entry.py +++ b/stock/doctype/stock_entry/test_stock_entry.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # ERPNext - web based ERP (http://erpnext.com) # For license information, please see license.txt diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.py b/stock/doctype/stock_entry_detail/stock_entry_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/stock_entry_detail/stock_entry_detail.py +++ b/stock/doctype/stock_entry_detail/stock_entry_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/stock_ledger/stock_ledger.py b/stock/doctype/stock_ledger/stock_ledger.py index ea38364ca2e..77ec060358c 100644 --- a/stock/doctype/stock_ledger/stock_ledger.py +++ b/stock/doctype/stock_ledger/stock_ledger.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index 664ead21d90..4a78421d6cb 100644 --- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.js b/stock/doctype/stock_reconciliation/stock_reconciliation.js index e43ddf4efee..4a66c3c3f9e 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require("public/app/js/controllers/stock_controller.js"); wn.provide("erpnext.stock"); diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.py b/stock/doctype/stock_reconciliation/stock_reconciliation.py index 279856be000..ecf0cbca49e 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 3eb8fe7bc3c..79fc14e67c0 100644 --- a/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # ERPNext - web based ERP (http://erpnext.com) # For license information, please see license.txt diff --git a/stock/doctype/stock_settings/stock_settings.py b/stock/doctype/stock_settings/stock_settings.py index f19c8fc6a34..bc7dcba4fdf 100644 --- a/stock/doctype/stock_settings/stock_settings.py +++ b/stock/doctype/stock_settings/stock_settings.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js index 86f5bffeaa7..65e10dd08aa 100644 --- a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js +++ b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt $.extend(cur_frm.cscript, { onload: function() { diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py index 7e5d972afdc..4e69a378033 100644 --- a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +++ b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/uom_conversion_detail/uom_conversion_detail.py b/stock/doctype/uom_conversion_detail/uom_conversion_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/stock/doctype/uom_conversion_detail/uom_conversion_detail.py +++ b/stock/doctype/uom_conversion_detail/uom_conversion_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/warehouse/test_warehouse.py b/stock/doctype/warehouse/test_warehouse.py index d1b4491f609..a4dadf35237 100644 --- a/stock/doctype/warehouse/test_warehouse.py +++ b/stock/doctype/warehouse/test_warehouse.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + test_records = [ [{ "doctype": "Warehouse", diff --git a/stock/doctype/warehouse/warehouse.js b/stock/doctype/warehouse/warehouse.js index 8d768dbbf1b..3451863a60d 100644 --- a/stock/doctype/warehouse/warehouse.js +++ b/stock/doctype/warehouse/warehouse.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc) { cur_frm.toggle_display('warehouse_name', doc.__islocal); @@ -39,4 +26,4 @@ cur_frm.set_query("account", function() { 'group_or_ledger': "Ledger" } } -}) \ No newline at end of file +}) diff --git a/stock/doctype/warehouse/warehouse.py b/stock/doctype/warehouse/warehouse.py index 69d9d06b85d..0de27fe647f 100644 --- a/stock/doctype/warehouse/warehouse.py +++ b/stock/doctype/warehouse/warehouse.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/doctype/warehouse_user/warehouse_user.py b/stock/doctype/warehouse_user/warehouse_user.py index 928aa9ff9f2..784339de7db 100644 --- a/stock/doctype/warehouse_user/warehouse_user.py +++ b/stock/doctype/warehouse_user/warehouse_user.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + # For license information, please see license.txt from __future__ import unicode_literals diff --git a/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js index b9b4c8053bb..fe2c0d629d6 100644 --- a/stock/page/stock_ageing/stock_ageing.js +++ b/stock/page/stock_ageing/stock_ageing.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.pages['stock-ageing'].onload = function(wrapper) { diff --git a/stock/page/stock_analytics/stock_analytics.js b/stock/page/stock_analytics/stock_analytics.js index a52cb7da54f..547f5ac844a 100644 --- a/stock/page/stock_analytics/stock_analytics.js +++ b/stock/page/stock_analytics/stock_analytics.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.pages['stock-analytics'].onload = function(wrapper) { diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js index 4abd533b433..17f9b8d4816 100644 --- a/stock/page/stock_balance/stock_balance.js +++ b/stock/page/stock_balance/stock_balance.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.require("app/js/stock_analytics.js"); diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js index 5c85c691758..580c2dc973b 100644 --- a/stock/page/stock_home/stock_home.js +++ b/stock/page/stock_home/stock_home.js @@ -1,5 +1,5 @@ -// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -// GNU General Public License. See "license.txt" +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt" wn.module_page["Stock"] = [ { diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js index 3ca27c58906..33bceeb747e 100644 --- a/stock/page/stock_ledger/stock_ledger.js +++ b/stock/page/stock_ledger/stock_ledger.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.pages['stock-ledger'].onload = function(wrapper) { wn.ui.make_app_page({ diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index 5f129c3ef2c..0699b7d7cda 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.pages['stock-level'].onload = function(wrapper) { wn.ui.make_app_page({ diff --git a/stock/report/batch_wise_balance_history/batch_wise_balance_history.js b/stock/report/batch_wise_balance_history/batch_wise_balance_history.js index 98293e45f70..a9d64777541 100644 --- a/stock/report/batch_wise_balance_history/batch_wise_balance_history.js +++ b/stock/report/batch_wise_balance_history/batch_wise_balance_history.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Batch-Wise Balance History"] = { "filters": [ { diff --git a/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/stock/report/batch_wise_balance_history/batch_wise_balance_history.py index 530465e9ae7..e198b8ee478 100644 --- a/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +++ b/stock/report/batch_wise_balance_history/batch_wise_balance_history.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt b/stock/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt deleted file mode 100644 index 920d00d192a..00000000000 --- a/stock/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "creation": "2013-07-30 17:28:49", - "docstatus": 0, - "modified": "2013-07-31 11:46:34", - "modified_by": "Administrator", - "owner": "Administrator" - }, - { - "doctype": "Report", - "is_standard": "Yes", - "name": "__common__", - "query": "select\n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n\t`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n\t`tabDelivery Note`.`posting_date` as \"Date:Date\",\n\t`tabDelivery Note`.`project_name` as \"Project\",\n\t`tabDelivery Note Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabDelivery Note Item`.`qty` - ifnull((select sum(qty) from `tabSales Invoice Item` \n\t where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n\t `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Qty:Float:110\",\n\t(`tabDelivery Note Item`.`amount` - ifnull((select sum(amount) from `tabSales Invoice Item` \n where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\n\t\tas \"Amount:Currency:110\",\n\t`tabDelivery Note Item`.`item_name` as \"Item Name::150\",\n\t`tabDelivery Note Item`.`description` as \"Description::200\"\nfrom `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note`.docstatus = 1 and\n\t`tabDelivery Note`.`status` != \"Stopped\" and\n `tabDelivery Note`.name = `tabDelivery Note Item`.parent and\n (`tabDelivery Note Item`.qty > ifnull((select sum(qty) from `tabSales Invoice Item` \n where `tabSales Invoice Item`.delivery_note = `tabDelivery Note`.name and\n `tabSales Invoice Item`.dn_detail = `tabDelivery Note Item`.name), 0))\norder by `tabDelivery Note`.`name` desc", - "ref_doctype": "Delivery Note", - "report_name": "Delivered Items To Be Billed", - "report_type": "Query Report" - }, - { - "doctype": "Report", - "name": "Delivered Items To Be Billed" - } -] \ No newline at end of file diff --git a/stock/report/delivery_note_trends/delivery_note_trends.js b/stock/report/delivery_note_trends/delivery_note_trends.js index 3ec5e594d7b..46e5106635c 100644 --- a/stock/report/delivery_note_trends/delivery_note_trends.js +++ b/stock/report/delivery_note_trends/delivery_note_trends.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.require("app/js/sales_trends_filters.js"); wn.query_reports["Delivery Note Trends"] = { diff --git a/stock/report/delivery_note_trends/delivery_note_trends.py b/stock/report/delivery_note_trends/delivery_note_trends.py index e5b2cd094be..f66ad29a781 100644 --- a/stock/report/delivery_note_trends/delivery_note_trends.py +++ b/stock/report/delivery_note_trends/delivery_note_trends.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/report/item_prices/item_prices.py b/stock/report/item_prices/item_prices.py index fb69086252d..fbeba7c2f93 100644 --- a/stock/report/item_prices/item_prices.py +++ b/stock/report/item_prices/item_prices.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js index b8aa378828f..410feabf759 100644 --- a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js +++ b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Itemwise Recommended Reorder Level"] = { "filters": [ { diff --git a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py index 588132f9616..dda21762d33 100644 --- a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +++ b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt import webnotes from webnotes.utils import getdate, flt diff --git a/stock/report/purchase_receipt_trends/purchase_receipt_trends.js b/stock/report/purchase_receipt_trends/purchase_receipt_trends.js index ecfa5a473e7..3637ea300e8 100644 --- a/stock/report/purchase_receipt_trends/purchase_receipt_trends.js +++ b/stock/report/purchase_receipt_trends/purchase_receipt_trends.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.require("app/js/purchase_trends_filters.js"); wn.query_reports["Purchase Receipt Trends"] = { diff --git a/stock/report/purchase_receipt_trends/purchase_receipt_trends.py b/stock/report/purchase_receipt_trends/purchase_receipt_trends.py index b41ce281f7e..395c4261ceb 100644 --- a/stock/report/purchase_receipt_trends/purchase_receipt_trends.py +++ b/stock/report/purchase_receipt_trends/purchase_receipt_trends.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js index 2ce5b4b4ab9..942b4651bfd 100644 --- a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js +++ b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.query_reports["Warehouse-Wise Stock Balance"] = { "filters": [ { diff --git a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py index 4389aa59e41..4d42c229f21 100644 --- a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py +++ b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes @@ -42,8 +29,8 @@ def get_columns(filters): """return columns based on filters""" columns = ["Item:Link/Item:100", "Item Name::150", "Description::150", \ - "Warehouse:Link/Warehouse:100", "Opening Qty::90", \ - "In Qty::80", "Out Qty::80", "Balance Qty::90", "Company:Link/Company:100"] + "Warehouse:Link/Warehouse:100", "Opening Qty:Float:90", \ + "In Qty:Float:80", "Out Qty:Float:80", "Balance Qty:Float:90", "Company:Link/Company:100"] return columns diff --git a/stock/stock_ledger.py b/stock/stock_ledger.py index 10e490c8e00..4dcca6708e7 100644 --- a/stock/stock_ledger.py +++ b/stock/stock_ledger.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt import webnotes from webnotes import msgprint diff --git a/stock/utils.py b/stock/utils.py index 5d5c872ccb8..29c7ed073f8 100644 --- a/stock/utils.py +++ b/stock/utils.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt import webnotes from webnotes import msgprint, _ diff --git a/support/doctype/customer_issue/customer_issue.js b/support/doctype/customer_issue/customer_issue.js index 9535fbadfce..5b670d452c2 100644 --- a/support/doctype/customer_issue/customer_issue.js +++ b/support/doctype/customer_issue/customer_issue.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.support"); // TODO commonify this code diff --git a/support/doctype/customer_issue/customer_issue.py b/support/doctype/customer_issue/customer_issue.py index 60887f93182..910e9b845d3 100644 --- a/support/doctype/customer_issue/customer_issue.py +++ b/support/doctype/customer_issue/customer_issue.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.js b/support/doctype/maintenance_schedule/maintenance_schedule.js index 436cabade68..6b693435ab4 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.js +++ b/support/doctype/maintenance_schedule/maintenance_schedule.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.support"); // TODO commonify this code diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.py b/support/doctype/maintenance_schedule/maintenance_schedule.py index 0e2d1f99202..8659b9ff036 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.py +++ b/support/doctype/maintenance_schedule/maintenance_schedule.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py index 7f48feb2ebf..26d0f769688 100644 --- a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py +++ b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py b/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py index 7f48feb2ebf..26d0f769688 100644 --- a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py +++ b/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/support/doctype/maintenance_visit/maintenance_visit.js b/support/doctype/maintenance_visit/maintenance_visit.js index 4257afaf0f5..ef6f110cfb4 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.js +++ b/support/doctype/maintenance_visit/maintenance_visit.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt wn.provide("erpnext.support"); // TODO commonify this code diff --git a/support/doctype/maintenance_visit/maintenance_visit.py b/support/doctype/maintenance_visit/maintenance_visit.py index e5f72809185..bf8767becec 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.py +++ b/support/doctype/maintenance_visit/maintenance_visit.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py b/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py index 7f48feb2ebf..26d0f769688 100644 --- a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py +++ b/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/support/doctype/newsletter/newsletter.js b/support/doctype/newsletter/newsletter.js index 5842accac0d..8cbf8fc470e 100644 --- a/support/doctype/newsletter/newsletter.js +++ b/support/doctype/newsletter/newsletter.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc) { erpnext.hide_naming_series(); diff --git a/support/doctype/newsletter/newsletter.py b/support/doctype/newsletter/newsletter.py index e654470998f..cdfd3701e18 100644 --- a/support/doctype/newsletter/newsletter.py +++ b/support/doctype/newsletter/newsletter.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals diff --git a/support/doctype/newsletter/test_newsletter.py b/support/doctype/newsletter/test_newsletter.py index 0813cfe727e..fae3e40c49b 100644 --- a/support/doctype/newsletter/test_newsletter.py +++ b/support/doctype/newsletter/test_newsletter.py @@ -1,3 +1,6 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt + import webnotes, unittest class TestNewsletter(unittest.TestCase): diff --git a/support/doctype/support_ticket/get_support_mails.py b/support/doctype/support_ticket/get_support_mails.py index fd3d3eacee1..7e09846dda5 100644 --- a/support/doctype/support_ticket/get_support_mails.py +++ b/support/doctype/support_ticket/get_support_mails.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js index 4b39631b608..2c1f3322f33 100644 --- a/support/doctype/support_ticket/support_ticket.js +++ b/support/doctype/support_ticket/support_ticket.js @@ -1,18 +1,5 @@ -// 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 . +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) { return{ query:"controllers.queries.customer_query" } } diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py index 2da6fca710b..2b8fe85c98b 100644 --- a/support/doctype/support_ticket/support_ticket.py +++ b/support/doctype/support_ticket/support_ticket.py @@ -1,18 +1,5 @@ -# 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 . +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +# License: GNU General Public License v3. See license.txt from __future__ import unicode_literals import webnotes diff --git a/support/page/support_analytics/support_analytics.js b/support/page/support_analytics/support_analytics.js index 9b46e6dd3cc..7e449178a68 100644 --- a/support/page/support_analytics/support_analytics.js +++ b/support/page/support_analytics/support_analytics.js @@ -1,3 +1,6 @@ +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt + wn.pages['support-analytics'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, diff --git a/support/page/support_home/support_home.js b/support/page/support_home/support_home.js index ea8474cf889..0ae1b8b4bf4 100644 --- a/support/page/support_home/support_home.js +++ b/support/page/support_home/support_home.js @@ -1,5 +1,5 @@ -// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd -// GNU General Public License. See "license.txt" +// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. +// License: GNU General Public License v3. See license.txt" wn.module_page["Support"] = [ { diff --git a/translations/de.csv b/translations/de.csv index 106ccd34bb9..c3e9a76505c 100644 --- a/translations/de.csv +++ b/translations/de.csv @@ -1,28 +1,32 @@ (Half Day),(Halber Tag) + against sales order,gegen Kundenauftrag against same operation,gegen dieselbe Operation - already marked,شهدت بالفعل + already marked,bereits markierten and year: ,und Jahr: at warehouse: ,im Warenlager: - by Role ,von Rolle + by Role ,von Role + can not be made.,nicht vorgenommen werden. cannot be 0,nicht 0 sein kann - cannot be deleted.,لا يمكن حذف. - does not belong to the company,لا تنتمي إلى الشركة + cannot be deleted.,kann nicht gelöscht werden. + does not belong to the company,nicht dem Unternehmen gehören has already been submitted.,wurde bereits eingereicht. + has been freezed. ,wurde eingefroren. has been freezed. \ Only Accounts Manager can do transaction against this account,Wurde eingefroren. \ Nur Accounts Manager kann Transaktion gegen dieses Konto zu tun " is less than equals to zero in the system, \ valuation rate is mandatory for this item",weniger als gleich im System Null ist \ Wertansatz für diesen Artikel zwingend is mandatory,zwingend is mandatory for GL Entry,ist für GL Eintrag zwingend is not a ledger,ist nicht ein Ledger is not active,nicht aktiv - is not set,لم يتم تعيين + is not set,nicht gesetzt is now the default Fiscal Year. \ Please refresh your browser for the change to take effect.,"Ist nun der Standard Geschäftsjahr. \ Bitte Ihren Browser aktualisieren, damit die Änderungen wirksam werden." - is present in one or many Active BOMs,موجود في BOMs واحد أو العديد من بالموقع - not active or does not exists in the system,غير نشطة أو لا موجود في نظام + is present in one or many Active BOMs,ist in einer oder mehreren Active BOMs + not active or does not exists in the system,nicht aktiv oder existiert nicht im System not submitted,nicht vorgelegt or the BOM is cancelled or inactive,oder das BOM wird abgebrochen oder inaktiv should be 'Yes'. As Item: ,sollte "Ja". Als Item: should be same as that in ,sollte dieselbe wie die in was on leave on ,war im Urlaub aus + will be ,wird will be over-billed against mentioned ,wird gegen erwähnt überrepräsentiert in Rechnung gestellt werden will become ,werden """Company History""",Firmengeschichte @@ -30,26 +34,26 @@ % Delivered,% Lieferung % Amount Billed,% Rechnungsbetrag % Billed,% Billed -% Completed,٪ مكتمل +% Completed,% Abgeschlossen % Installed,% Installierte % Received,% Erhaltene % of materials billed against this Purchase Order.,% Der Materialien gegen diese Bestellung in Rechnung gestellt. % of materials billed against this Sales Order,% Der Materialien gegen diesen Kundenauftrag abgerechnet % of materials delivered against this Delivery Note,% Der Materialien gegen diese Lieferschein % of materials delivered against this Sales Order,% Der Materialien gegen diesen Kundenauftrag geliefert -% of materials ordered against this Material Request,٪ من المواد المطلوبة ضد هذه المادة طلب +% of materials ordered against this Material Request,% Der bestellten Materialien gegen diesen Werkstoff anfordern % of materials received against this Purchase Order,% Der Materialien erhalten gegen diese Bestellung -"' can not be managed using Stock Reconciliation.\ You can add/delete Serial No directly, \ to modify stock of this item.",'لا يمكن إدارتها باستخدام المصالحة المالية. \ يمكنك إضافة / حذف رقم المسلسل مباشرة، \ لتعديل الأوراق المالية من هذا البند. +"' can not be managed using Stock Reconciliation.\ You can add/delete Serial No directly, \ to modify stock of this item.",'Kann nicht verwaltet mit Lager Versöhnung werden. \ Sie können hinzufügen / löschen Seriennummer direkt \ to stock dieses Artikels ändern. ' in Company: ,'In Unternehmen: -'To Case No.' cannot be less than 'From Case No.','بالقضية رقم' لا يمكن أن يكون أقل من 'من القضية رقم' +'To Case No.' cannot be less than 'From Case No.','To Fall Nr.' kann nicht kleiner sein als "Von Fall Nr. ' * Will be calculated in the transaction.,* Wird in der Transaktion berechnet werden. "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**","** Budget Verteilung ** hilft Ihnen verteilen Sie Ihr Budget über Monate, wenn Sie Saisonalität in Ihrem business.To vertreiben ein Budget Verwendung dieser Verteilung, setzen Sie diesen ** Budget Verteilung ** in der ** Cost Center ** haben" **Currency** Master,** Währung ** Meister **Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Geschäftsjahr ** ein Geschäftsjahr. Alle Buchungen und anderen wichtigen Transaktionen gegen ** Geschäftsjahr ** verfolgt. -. Outstanding cannot be less than zero. \ Please match exact outstanding.,. المعلقة لا يمكن أن يكون أقل من الصفر. \ الرجاء تطابق تام المعلقة. -. Please set status of the employee as 'Left',. يرجى تغيير الحالة للموظف ب "الزمن" -. You can not mark his attendance as 'Present',. لا يمكنك وضع علامة حضوره ك 'هدية' -"000 is black, fff is white",000 سوداء، بيضاء FFF +. Outstanding cannot be less than zero. \ Please match exact outstanding.,. Herausragende kann nicht kleiner als Null ist. \ Bitte Exakte hervorragend. +. Please set status of the employee as 'Left',. Bitte setzen Sie den Status des Mitarbeiters als "links" +. You can not mark his attendance as 'Present',. Sie können nicht markieren seine Teilnahme als "Gegenwart" +"000 is black, fff is white","000 ist schwarz, weiß fff" 1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent,1 Währung = [?] FractionFor beispielsweise 1 USD = 100 Cent 1. To maintain the customer wise item code and to make them searchable based on their code use this option,Ein. Um den Kunden kluge Artikel Code zu pflegen und um sie durchsuchbar basierend auf ihren Code um diese Option 12px,12px @@ -64,10 +68,10 @@ "To manage Customer Groups, click here"," Kundengruppen zu verwalten, klicken Sie hier " "Manage Item Groups"," Artikel Gruppen verwalten " "To manage Territory, click here"," Um Territory zu verwalten, klicken Sie hier " -"Manage Customer Groups","إدارة مجموعات العملاء" +"Manage Customer Groups","Verwalten von Kunden-Gruppen" "To manage Territory, click here"," Um Territory zu verwalten, klicken Sie hier " -"Manage Item Groups","إدارة مجموعات السلعة" -"Territory","إقليم" +"Manage Item Groups","Artikel verwalten Gruppen" +"Territory","Bereich" "To manage Territory, click here"," Um Territory zu verwalten, klicken Sie hier " "\
  • field:[fieldname] - By Field\
  • naming_series: - By Naming Series (field called naming_series must be present\
  • eval:[expression] - Evaluate an expression in python (self is doc)\
  • Prompt - Prompt user for a name\
  • [series] - Series by prefix (separated by a dot); for example PRE.#####\')"">Naming Options"," \
  • Feld: [Feldname] - Durch Feld \
  • naming_series: - durch die Benennung Series (Feld namens naming_series muss vorhanden sein \
  • eval: [Ausdruck] - Bewerten Sie einen Ausdruck in python (Selbst ist doc) \
  • Prompt - Benutzer nach einem Namen \
  • [Serie] - Series by Prefix (getrennt durch einen Punkt);. zum Beispiel PRE # # # # # \ ') ""> Naming Optionen " Cancel allows you change Submitted documents by cancelling them and amending them., Abbrechen können Sie ändern eingereichten Unterlagen durch Vernichtung von ihnen und zur Änderung ihnen. @@ -76,7 +80,7 @@ A Customer exists with same name,Ein Kunde gibt mit dem gleichen Namen A Lead with this email id should exist,Ein Lead mit dieser E-Mail-ID sollte vorhanden sein "A Product or a Service that is bought, sold or kept in stock.","Ein Produkt oder eine Dienstleistung, die gekauft, verkauft oder gehalten auf Lager." A Supplier exists with same name,Ein Lieferant existiert mit dem gleichen Namen -A condition for a Shipping Rule,وهناك شرط للشحن قاعدة +A condition for a Shipping Rule,Eine Bedingung für einen Versand Rule A logical Warehouse against which stock entries are made.,Eine logische Warehouse gegen die Lager-Einträge vorgenommen werden. A new popup will open that will ask you to select further conditions.,"Ein neues Pop-up öffnet das wird Sie bitten, weitere Bedingungen zu wählen." A symbol for this currency. For e.g. $,Ein Symbol für diese Währung. Für z.B. $ @@ -105,18 +109,19 @@ Account Head,Konto Leiter Account Id,Konto-ID Account Name,Account Name Account Type,Kontotyp -Accounting,المحاسبة -Accounting Year.,السنة المحاسبية. -"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",قيد محاسبي المجمدة تصل إلى هذا التاريخ، لا أحد يمكن أن تفعل / تعديل إدخال باستثناء دور المحددة أدناه. +Account for this ,Konto für diese +Accounting,Buchhaltung +Accounting Year.,Rechnungsjahres. +"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Buchhaltungseingaben bis zu diesem Zeitpunkt eingefroren, kann niemand / nicht ändern Eintrag außer Rolle unten angegebenen." Accounting journal entries.,Accounting Journaleinträge. Accounts,Konten Accounts Frozen Upto,Konten Bis gefroren Accounts Payable,Kreditorenbuchhaltung Accounts Receivable,Debitorenbuchhaltung -Accounts Settings,إعدادات الحسابات +Accounts Settings,Konten-Einstellungen Action,Aktion Active,Aktiv -Active: Will extract emails from ,Aktiv: Werden E-Mails extrahieren +Active: Will extract emails from ,Aktive: Wird E-Mails zu extrahieren Activity,Aktivität Activity Log,Activity Log Activity Type,Art der Tätigkeit @@ -125,8 +130,8 @@ Actual Budget,Tatsächliche Budget Actual Completion Date,Tatsächliche Datum der Fertigstellung Actual Date,Aktuelles Datum Actual End Date,Actual End Datum -Actual Invoice Date,الفعلي تاريخ الفاتورة -Actual Posting Date,تاريخ النشر الفعلي +Actual Invoice Date,Tag der Rechnungslegung +Actual Posting Date,Tatsächliche Buchungsdatum Actual Qty,Tatsächliche Menge Actual Qty (at source/target),Tatsächliche Menge (an der Quelle / Ziel) Actual Qty After Transaction,Tatsächliche Menge Nach Transaction @@ -140,28 +145,28 @@ Add Attachments,Anhänge hinzufügen Add Bookmark,Lesezeichen hinzufügen Add CSS,Fügen Sie CSS Add Column,Spalte hinzufügen -Add Comment,إضافة تعليق -Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.,إضافة خدمة Google Analytics ID: على سبيل المثال. UA-89XXX57-1. الرجاء بحث المساعدة على تحليلات جوجل لمزيد من المعلومات. +Add Comment,Kommentar hinzufügen +Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.,In Google Analytics ID: zB. UA-89XXX57-1. Bitte suchen Sie Hilfe zu Google Analytics für weitere Informationen. Add Message,Nachricht hinzufügen Add New Permission Rule,Add New Permission Rule Add Reply,Fügen Sie Antworten -Add Terms and Conditions for the Material Request. You can also prepare a Terms and Conditions Master and use the Template,إضافة بنود وشروط لطلب المواد. يمكنك أيضا إعداد الشروط والأحكام الماجستير واستخدام القالب +Add Terms and Conditions for the Material Request. You can also prepare a Terms and Conditions Master and use the Template,In Allgemeinen Geschäftsbedingungen für das Material-Request. Sie können auch ein Master-AGB und verwenden Sie die Vorlage Add Terms and Conditions for the Purchase Receipt. You can also prepare a Terms and Conditions Master and use the Template.,Hinzufügen Geschäftsbedingungen für den Kaufbeleg. Sie können auch eine AGB-Master und verwenden Sie die Vorlage. "Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a Terms and Conditions Master and use the Template","Fügen AGB für das Angebot wie Zahlungsbedingungen, Gültigkeit des Angebots etc. Sie können auch ein AGB-Master und verwenden Sie die Vorlage" -Add Total Row,إضافة صف الإجمالي -Add a banner to the site. (small banners are usually good),إضافة لافتة إلى الموقع. (لافتات صغيرة عادة ما تكون جيدة) -Add attachment,إضافة المرفقات +Add Total Row,In insgesamt Row +Add a banner to the site. (small banners are usually good),Hinzufügen einen Banner auf der Website. (Kleine Banner sind in der Regel gut) +Add attachment,Anhang hinzufügen Add code as <script>,Fügen Sie Code wie