Nabin Hait 57595cf73b fixed merge conflict

2014-12-23 18:05:13 +05:30

..

accounts

fixed merge conflict

2014-12-23 18:05:13 +05:30

buying

modified date updated in supplier.json

2014-12-15 14:22:14 +05:30

config

Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above

2014-12-23 17:38:59 +05:30

contacts

…

controllers

…

hr

test case fix - holiday list

2014-12-23 17:38:59 +05:30

manufacturing

Actual operation cost in stock entry, fixed cost removed from bom and workstation

2014-12-23 17:39:00 +05:30

patches

fixed merge conflict

2014-12-23 18:05:13 +05:30

projects

Actual operation cost in stock entry, fixed cost removed from bom and workstation

2014-12-23 17:39:00 +05:30

public

company wise letter head feature added

2014-12-23 17:52:41 +05:30

selling

…

setup

company wise letter head feature added

2014-12-23 17:52:41 +05:30

shopping_cart

…

startup

…

stock

Merge pull request #2497 from neilLasrado/batch-redesign

2014-12-23 17:44:41 +05:30

support

…

templates

minor fixes

2014-12-23 17:38:59 +05:30

tests

…

translations

…

utilities

…

__init__.py

…

__version__.py

…

hooks.py

minor fix

2014-12-15 11:57:19 +05:30

modules.txt

…

patches.txt

fixed merge conflict

2014-12-23 18:05:13 +05:30

tasks.py

…