Merge lp:~dorian-kemps/unifield-server/US-3372 into lp:unifield-server
- US-3372
- Merge into trunk
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 4501 |
| Proposed branch: | lp:~dorian-kemps/unifield-server/US-3372 |
| Merge into: | lp:unifield-server |
| Diff against target: |
536 lines (+228/-200) 2 files modified
bin/addons/sale/report/sale_loan_stock_moves_report.py (+127/-125) bin/addons/sale/report/sale_loan_stock_moves_report_xls.mako (+101/-75) |
| To merge this branch: | bzr merge lp:~dorian-kemps/unifield-server/US-3372 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'bin/addons/sale/report/sale_loan_stock_moves_report.py' | |||
| 2 | --- bin/addons/sale/report/sale_loan_stock_moves_report.py 2017-08-25 16:02:26 +0000 | |||
| 3 | +++ bin/addons/sale/report/sale_loan_stock_moves_report.py 2017-09-13 12:13:20 +0000 | |||
| 4 | @@ -31,24 +31,26 @@ | |||
| 5 | 31 | super(sale_loan_stock_moves_report_parser, self).__init__(cr, uid, name, context=context) | 31 | super(sale_loan_stock_moves_report_parser, self).__init__(cr, uid, name, context=context) |
| 6 | 32 | self.cr = cr | 32 | self.cr = cr |
| 7 | 33 | self.uid = uid | 33 | self.uid = uid |
| 8 | 34 | self.user_company = self._get_user_company() | ||
| 9 | 34 | self.localcontext.update({ | 35 | self.localcontext.update({ |
| 10 | 35 | 'time': time, | 36 | 'time': time, |
| 11 | 36 | 'getMoves': self._get_moves, | 37 | 'getMoves': self._get_moves, |
| 12 | 37 | 'isQtyOut': self._is_qty_out, | 38 | 'isQtyOut': self._is_qty_out, |
| 13 | 38 | 'getQty': self._get_qty, | 39 | 'getQty': self._get_qty, |
| 15 | 39 | 'getInstance': self._get_instance, | 40 | 'getUserCompany': self._get_user_company, |
| 16 | 41 | 'getFirstSplitOnUnderscore': self._get_first_split_on_underscore, | ||
| 17 | 42 | 'computeCurrency': self._compute_currency, | ||
| 18 | 40 | }) | 43 | }) |
| 19 | 41 | 44 | ||
| 20 | 42 | def _is_qty_out(self, move): | 45 | def _is_qty_out(self, move): |
| 21 | 43 | ''' | 46 | ''' |
| 22 | 44 | Check if the move is an in or an out | 47 | Check if the move is an in or an out |
| 23 | 45 | ''' | 48 | ''' |
| 24 | 46 | out = False | ||
| 25 | 47 | 49 | ||
| 26 | 48 | if (move.location_id.usage == 'internal') and (move.location_dest_id and move.location_dest_id.usage in ('customer', 'supplier')): | 50 | if (move.location_id.usage == 'internal') and (move.location_dest_id and move.location_dest_id.usage in ('customer', 'supplier')): |
| 28 | 49 | out = True | 51 | return True |
| 29 | 50 | 52 | ||
| 31 | 51 | return out | 53 | return False |
| 32 | 52 | 54 | ||
| 33 | 53 | def _get_qty(self, move): | 55 | def _get_qty(self, move): |
| 34 | 54 | ''' | 56 | ''' |
| 35 | @@ -62,141 +64,141 @@ | |||
| 36 | 62 | 64 | ||
| 37 | 63 | return qty | 65 | return qty |
| 38 | 64 | 66 | ||
| 39 | 65 | def _get_move_obj(self, cr, uid, obj_obj, move): | ||
| 40 | 66 | ''' | ||
| 41 | 67 | Return the move's order type object | ||
| 42 | 68 | ''' | ||
| 43 | 69 | obj_id = False | ||
| 44 | 70 | obj = False | ||
| 45 | 71 | acronym_type = False | ||
| 46 | 72 | |||
| 47 | 73 | for split_origin in move.origin.split(":"): | ||
| 48 | 74 | if obj_obj == self.pool.get('sale.order'): | ||
| 49 | 75 | acronym_type = 'FO' | ||
| 50 | 76 | elif obj_obj == self.pool.get('purchase.order'): | ||
| 51 | 77 | acronym_type = 'PO' | ||
| 52 | 78 | |||
| 53 | 79 | if acronym_type and acronym_type in split_origin: | ||
| 54 | 80 | obj_name = str(split_origin.split("/")[-1].split("-")[0]) | ||
| 55 | 81 | obj_id = obj_obj.search(cr, uid, [('name', 'like', obj_name + '-')]) | ||
| 56 | 82 | if not obj_id: | ||
| 57 | 83 | obj_id = obj_obj.search(cr, uid, [('name', 'like', obj_name)]) | ||
| 58 | 84 | |||
| 59 | 85 | if obj_id: | ||
| 60 | 86 | obj = obj_obj.browse(cr, uid, obj_id[0]) | ||
| 61 | 87 | break | ||
| 62 | 88 | |||
| 63 | 89 | return obj | ||
| 64 | 90 | |||
| 65 | 91 | def _get_moves(self, report): | 67 | def _get_moves(self, report): |
| 66 | 92 | ''' | 68 | ''' |
| 67 | 93 | Return the moves for the report and set their qty balance | 69 | Return the moves for the report and set their qty balance |
| 68 | 94 | ''' | 70 | ''' |
| 69 | 95 | so_obj = self.pool.get('sale.order') | 71 | so_obj = self.pool.get('sale.order') |
| 70 | 96 | po_obj = self.pool.get('purchase.order') | 72 | po_obj = self.pool.get('purchase.order') |
| 71 | 97 | result = [] | ||
| 72 | 98 | sm_list = [] | 73 | sm_list = [] |
| 73 | 74 | # TODO: we must search on counterpart if filter is used on wizard | ||
| 74 | 99 | for move in report.sm_ids: | 75 | for move in report.sm_ids: |
| 75 | 100 | sm_list.append(self.pool.get('stock.move').browse(self.cr, self.uid, move)) | 76 | sm_list.append(self.pool.get('stock.move').browse(self.cr, self.uid, move)) |
| 76 | 101 | 77 | ||
| 83 | 102 | sm_list = sorted(sm_list, key=lambda sm: (sm['product_id']['default_code'], sm['origin'].split(":")[-1], sm['create_date'])) | 78 | sm_list = sorted(sm_list, key=lambda sm: sm['create_date']) |
| 84 | 103 | balance = 0 | 79 | move_by_fo_po_prod = {} |
| 85 | 104 | # dict used to check if the loan flow is done | 80 | keys_order = [] |
| 86 | 105 | dict_check_done = {} | 81 | |
| 87 | 106 | for index, move in enumerate(sm_list, start=0): | 82 | get_so_from_po_id = {} |
| 88 | 107 | move.balance = balance | 83 | get_po_from_so_id = {} |
| 89 | 84 | |||
| 90 | 85 | for move in sm_list: | ||
| 91 | 108 | if self._is_qty_out(move): | 86 | if self._is_qty_out(move): |
| 175 | 109 | balance -= self._get_qty(move) | 87 | qty = -1 * self._get_qty(move) |
| 176 | 110 | else: | 88 | else: |
| 177 | 111 | balance += self._get_qty(move) | 89 | qty = self._get_qty(move) |
| 178 | 112 | 90 | ||
| 179 | 113 | # check if the flow exists in the dict | 91 | dom = [] |
| 180 | 114 | move.status = 'Open' | 92 | status = 'Open' |
| 181 | 115 | move_ref = str(move.origin.split(":")[-1].split("/")[-1].split("-")[0]) | 93 | if move.purchase_line_id: |
| 182 | 116 | if not dict_check_done.get(move_ref, []): | 94 | po_found = move.purchase_line_id.order_id |
| 183 | 117 | if 'FO' in move.origin and 'PO' in move.origin: | 95 | if po_found.id not in get_so_from_po_id: |
| 184 | 118 | so_state = self._get_move_obj(self.cr, self.uid, so_obj, move).state | 96 | if po_found.loan_id: |
| 185 | 119 | po_state = self._get_move_obj(self.cr, self.uid, po_obj, move).state | 97 | ids = [po_found.loan_id.id] |
| 186 | 120 | if so_state == 'done' and po_state == 'done': | 98 | elif po_found.origin[-2:] in ['-1', '-2', '-3']: |
| 187 | 121 | dict_check_done[move_ref] = 'Closed' | 99 | ids = so_obj.search(self.cr, self.uid, [('name', '=', po_found.origin)]) |
| 188 | 122 | else: | 100 | if not ids: |
| 189 | 123 | dict_check_done[move_ref] = 'Open' | 101 | ids = so_obj.search(self.cr, self.uid, [('name', '=', po_found.origin[0:-2])]) |
| 190 | 124 | elif 'FO' in move.origin and not 'PO' in move.origin: | 102 | else: |
| 191 | 125 | so_found = self._get_move_obj(self.cr, self.uid, so_obj, move) | 103 | ids = so_obj.search(self.cr, self.uid, [('name', '=', po_found.origin)]) |
| 192 | 126 | so_state = so_found.state | 104 | if not ids: |
| 193 | 127 | po_ids = po_obj.search(self.cr, self.uid, [('origin', '=', so_found.name)]) | 105 | dom = ['%s-%s' % (po_found.origin, i) for i in [1, 2, 3]] |
| 194 | 128 | if len(po_ids) > 0: | 106 | ids = so_obj.search(self.cr, self.uid, [('name', 'in', dom)]) |
| 195 | 129 | po_state = po_obj.browse(self.cr, self.uid, po_ids[0]).state | 107 | if ids: |
| 196 | 130 | if so_state == 'done' and po_state == 'done': | 108 | so = so_obj.browse(self.cr, self.uid, ids[0]) |
| 197 | 131 | dict_check_done[move_ref] = 'Closed' | 109 | if so.split_type_sale_order: |
| 198 | 132 | else: | 110 | ids = so_obj.search(self.cr, self.uid, [('name', '=', '%s-2' % so.name)]) |
| 199 | 133 | dict_check_done[move_ref] = 'Open' | 111 | if ids: |
| 200 | 134 | else: | 112 | so = so_obj.browse(self.cr, self.uid, ids[0]) |
| 201 | 135 | dict_check_done[move_ref] = 'Open' | 113 | get_so_from_po_id[po_found.id] = so |
| 202 | 136 | elif not 'FO' in move.origin and 'PO' in move.origin: | 114 | |
| 203 | 137 | po_found = self._get_move_obj(self.cr, self.uid, po_obj, move) | 115 | so_found = get_so_from_po_id.get(po_found.id) |
| 204 | 138 | po_state = po_found.state | 116 | if so_found and so_found.state == po_found.state == 'done': |
| 205 | 139 | so_ids = so_obj.search(self.cr, self.uid, [('name', '=', po_found.origin)]) | 117 | status = 'Closed' |
| 206 | 140 | if len(so_ids) > 0: | 118 | elif move.sale_line_id: |
| 207 | 141 | so_state = po_obj.browse(self.cr, self.uid, so_ids[0]).state | 119 | so_found = move.sale_line_id.order_id |
| 208 | 142 | if so_state == 'done' and po_state == 'done': | 120 | if so_found.id not in get_po_from_so_id: |
| 209 | 143 | dict_check_done[move_ref] = 'Closed' | 121 | if so_found.loan_id: |
| 210 | 144 | else: | 122 | ids = [so_found.loan_id.id] |
| 211 | 145 | dict_check_done[move_ref] = 'Open' | 123 | elif so_found.name[-2:] in ['-1', '-2', '-3']: |
| 212 | 146 | else: | 124 | ids = po_obj.search(self.cr, self.uid, [('origin', '=', so_found.name)]) |
| 213 | 147 | dict_check_done[move_ref] = 'Open' | 125 | if not ids: |
| 214 | 148 | # set the state according to the flow status | 126 | ids = po_obj.search(self.cr, self.uid, [('origin', '=', so_found.name[0:-2])]) |
| 215 | 149 | setattr(move, 'status', dict_check_done[move_ref]) | 127 | else: |
| 216 | 150 | 128 | ids = po_obj.search(self.cr, self.uid, [('origin', '=', so_found.name)]) | |
| 217 | 151 | # if the move is the last in the list | 129 | if ids: |
| 218 | 152 | if move is sm_list[-1]: | 130 | po_found = po_obj.browse(self.cr, self.uid, ids[0]) |
| 219 | 153 | setattr(move, 'balance', balance) | 131 | if po_found.state == 'split': |
| 220 | 154 | # remove closed flows | 132 | ids = po_obj.search(self.cr, self.uid, [('name', '=', '%s-2' % po_found.name)]) |
| 221 | 155 | if report.remove_completed: | 133 | po_found = po_obj.browse(self.cr, self.uid, ids[0]) |
| 222 | 156 | if move.status == 'Open': | 134 | get_po_from_so_id[so_found.id] = po_found |
| 223 | 157 | result.append(move) | 135 | |
| 224 | 158 | else: | 136 | po_found = get_po_from_so_id.get(so_found.id) |
| 225 | 159 | result.append(move) | 137 | if po_found and so_found.state == po_found.state == 'done': |
| 226 | 160 | balance = 0 | 138 | status = 'Closed' |
| 227 | 161 | else: | 139 | |
| 228 | 162 | # if the move's origin is different than the next one | 140 | if status != 'Closed' or not report.remove_completed: |
| 229 | 163 | if move.origin.split(":")[-1] not in sm_list[index+1].origin.split(":")[-1] and \ | 141 | setattr(move, 'status', status) |
| 230 | 164 | sm_list[index + 1].origin.split(":")[-1] not in move.origin.split(":")[-1]: | 142 | setattr(move, 'balance', 0) |
| 231 | 165 | setattr(move, 'balance', balance) | 143 | |
| 232 | 166 | # remove closed flows | 144 | key = ( |
| 233 | 167 | if report.remove_completed: | 145 | so_found and so_found.id or 'NF%s' % po_found.id, |
| 234 | 168 | if move.status == 'Open': | 146 | po_found and po_found.id or 'NF%s' % so_found.id, |
| 235 | 169 | result.append(move) | 147 | move.product_id.id |
| 236 | 170 | else: | 148 | ) |
| 237 | 171 | result.append(move) | 149 | if key not in move_by_fo_po_prod: |
| 238 | 172 | balance = 0 | 150 | keys_order.append(key) |
| 239 | 173 | else: | 151 | move_by_fo_po_prod[key] = {'balance': 0, 'moves': []} |
| 240 | 174 | # if the move's product is different than the next one | 152 | move_by_fo_po_prod[key]['balance'] += qty |
| 241 | 175 | if move.product_id.id != sm_list[index+1].product_id.id: | 153 | move_by_fo_po_prod[key]['moves'].append(move) |
| 242 | 176 | setattr(move, 'balance', balance) | 154 | |
| 243 | 177 | # remove closed flows | 155 | result = [] |
| 244 | 178 | if report.remove_completed: | 156 | for key in keys_order: |
| 245 | 179 | if move.status == 'Open': | 157 | move_by_fo_po_prod[key]['moves'][-1].balance = move_by_fo_po_prod[key]['balance'] |
| 246 | 180 | result.append(move) | 158 | result.append(move_by_fo_po_prod[key]['moves']) |
| 164 | 181 | else: | ||
| 165 | 182 | result.append(move) | ||
| 166 | 183 | balance = 0 | ||
| 167 | 184 | else: | ||
| 168 | 185 | setattr(move, 'balance', 0) | ||
| 169 | 186 | # remove closed flows | ||
| 170 | 187 | if report.remove_completed: | ||
| 171 | 188 | if move.status == 'Open': | ||
| 172 | 189 | result.append(move) | ||
| 173 | 190 | else: | ||
| 174 | 191 | result.append(move) | ||
| 247 | 192 | 159 | ||
| 248 | 193 | return result | 160 | return result |
| 249 | 194 | 161 | ||
| 255 | 195 | def _get_instance(self): | 162 | def _get_user_company(self): |
| 256 | 196 | ''' | 163 | ''' |
| 257 | 197 | Return user's current instance | 164 | Return user's current company |
| 258 | 198 | ''' | 165 | ''' |
| 259 | 199 | return self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id.instance_id.name | 166 | return self.pool.get('res.users').browse(self.cr, self.uid, self.uid).company_id |
| 260 | 167 | |||
| 261 | 168 | def _get_first_split_on_underscore(self, name): | ||
| 262 | 169 | ''' | ||
| 263 | 170 | Return the first data from a table with the string split to '_' | ||
| 264 | 171 | ''' | ||
| 265 | 172 | res = name | ||
| 266 | 173 | if res: | ||
| 267 | 174 | res = name.rsplit('_', 1)[0] | ||
| 268 | 175 | |||
| 269 | 176 | return res | ||
| 270 | 177 | |||
| 271 | 178 | def _compute_currency(self, move): | ||
| 272 | 179 | ''' | ||
| 273 | 180 | Compute an amount of a given currency to the instance's currency | ||
| 274 | 181 | ''' | ||
| 275 | 182 | currency_obj = self.pool.get('res.currency') | ||
| 276 | 183 | |||
| 277 | 184 | if not move.price_currency_id: | ||
| 278 | 185 | if move.price_unit is None: | ||
| 279 | 186 | return round(move.product_id.standard_price, 2) | ||
| 280 | 187 | if move.type == 'in': | ||
| 281 | 188 | from_currency_id = move.partner_id.property_product_pricelist_purchase.currency_id.id | ||
| 282 | 189 | else: | ||
| 283 | 190 | from_currency_id = move.partner_id.property_product_pricelist.currency_id.id | ||
| 284 | 191 | else: | ||
| 285 | 192 | from_currency_id = move.price_currency_id.id | ||
| 286 | 193 | |||
| 287 | 194 | context = {'date': move.date} | ||
| 288 | 195 | to_currency_id = self.user_company['currency_id'].id | ||
| 289 | 196 | |||
| 290 | 197 | if from_currency_id == to_currency_id: | ||
| 291 | 198 | return round(move.price_unit, 2) | ||
| 292 | 199 | |||
| 293 | 200 | return round(currency_obj.compute(self.cr, self.uid, from_currency_id, to_currency_id, move.price_unit, round=False, context=context), 2) | ||
| 294 | 201 | |||
| 295 | 200 | 202 | ||
| 296 | 201 | class sale_loan_stock_moves_report_xls(SpreadsheetReport): | 203 | class sale_loan_stock_moves_report_xls(SpreadsheetReport): |
| 297 | 202 | def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, | 204 | def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, |
| 298 | 203 | 205 | ||
| 299 | === modified file 'bin/addons/sale/report/sale_loan_stock_moves_report_xls.mako' | |||
| 300 | --- bin/addons/sale/report/sale_loan_stock_moves_report_xls.mako 2017-08-16 08:32:04 +0000 | |||
| 301 | +++ bin/addons/sale/report/sale_loan_stock_moves_report_xls.mako 2017-09-13 12:13:20 +0000 | |||
| 302 | @@ -39,25 +39,48 @@ | |||
| 303 | 39 | </Style> | 39 | </Style> |
| 304 | 40 | 40 | ||
| 305 | 41 | <!-- Lines --> | 41 | <!-- Lines --> |
| 325 | 42 | <Style ss:ID="line_left"> | 42 | <Style ss:ID="line_left0"> |
| 326 | 43 | <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/> | 43 | <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/> |
| 327 | 44 | <Borders> | 44 | <Borders> |
| 328 | 45 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/> | 45 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/> |
| 329 | 46 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/> | 46 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/> |
| 330 | 47 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/> | 47 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/> |
| 331 | 48 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/> | 48 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/> |
| 332 | 49 | </Borders> | 49 | </Borders> |
| 333 | 50 | <Font ss:Size="10"/> | 50 | <Font ss:Size="10"/> |
| 334 | 51 | </Style> | 51 | </Style> |
| 335 | 52 | <Style ss:ID="line_right"> | 52 | <Style ss:ID="line_right0"> |
| 336 | 53 | <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/> | 53 | <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/> |
| 337 | 54 | <Borders> | 54 | <Borders> |
| 338 | 55 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/> | 55 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/> |
| 339 | 56 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/> | 56 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/> |
| 340 | 57 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/> | 57 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/> |
| 341 | 58 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/> | 58 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/> |
| 342 | 59 | </Borders> | 59 | </Borders> |
| 343 | 60 | <Font ss:Size="10"/> | 60 | <Font ss:Size="10"/> |
| 344 | 61 | <NumberFormat ss:Format="#,##0.00"/> | ||
| 345 | 62 | </Style> | ||
| 346 | 63 | <Style ss:ID="line_left1"> | ||
| 347 | 64 | <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/> | ||
| 348 | 65 | <Borders> | ||
| 349 | 66 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/> | ||
| 350 | 67 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/> | ||
| 351 | 68 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/> | ||
| 352 | 69 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/> | ||
| 353 | 70 | </Borders> | ||
| 354 | 71 | <Font ss:Size="10"/> | ||
| 355 | 72 | <Interior ss:Color="#dddddd" ss:Pattern="Solid"/> | ||
| 356 | 73 | </Style> | ||
| 357 | 74 | <Style ss:ID="line_right1"> | ||
| 358 | 75 | <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/> | ||
| 359 | 76 | <Borders> | ||
| 360 | 77 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/> | ||
| 361 | 78 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/> | ||
| 362 | 79 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/> | ||
| 363 | 80 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/> | ||
| 364 | 81 | </Borders> | ||
| 365 | 82 | <Font ss:Size="10"/> | ||
| 366 | 83 | <Interior ss:Color="#dddddd" ss:Pattern="Solid"/> | ||
| 367 | 61 | <NumberFormat ss:Format="#,##0.00"/> | 84 | <NumberFormat ss:Format="#,##0.00"/> |
| 368 | 62 | </Style> | 85 | </Style> |
| 369 | 63 | <Style ss:ID="line_center"> | 86 | <Style ss:ID="line_center"> |
| 370 | @@ -71,15 +94,26 @@ | |||
| 371 | 71 | <Font ss:Size="10"/> | 94 | <Font ss:Size="10"/> |
| 372 | 72 | <NumberFormat ss:Format="#,##0.00"/> | 95 | <NumberFormat ss:Format="#,##0.00"/> |
| 373 | 73 | </Style> | 96 | </Style> |
| 383 | 74 | <Style ss:ID="sShortDate"> | 97 | <Style ss:ID="sShortDate0"> |
| 384 | 75 | <NumberFormat ss:Format="Short Date"/> | 98 | <NumberFormat ss:Format="Short Date"/> |
| 385 | 76 | <Alignment ss:Vertical="Center" ss:WrapText="1"/> | 99 | <Alignment ss:Vertical="Center" ss:WrapText="1"/> |
| 386 | 77 | <Borders> | 100 | <Borders> |
| 387 | 78 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" /> | 101 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" /> |
| 388 | 79 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" /> | 102 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" /> |
| 389 | 80 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" /> | 103 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" /> |
| 390 | 81 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" /> | 104 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" /> |
| 391 | 82 | </Borders> | 105 | </Borders> |
| 392 | 106 | </Style> | ||
| 393 | 107 | <Style ss:ID="sShortDate1"> | ||
| 394 | 108 | <NumberFormat ss:Format="Short Date"/> | ||
| 395 | 109 | <Alignment ss:Vertical="Center" ss:WrapText="1"/> | ||
| 396 | 110 | <Borders> | ||
| 397 | 111 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" /> | ||
| 398 | 112 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" /> | ||
| 399 | 113 | <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" /> | ||
| 400 | 114 | <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" /> | ||
| 401 | 115 | </Borders> | ||
| 402 | 116 | <Interior ss:Color="#dddddd" ss:Pattern="Solid"/> | ||
| 403 | 83 | </Style> | 117 | </Style> |
| 404 | 84 | </Styles> | 118 | </Styles> |
| 405 | 85 | 119 | ||
| 406 | @@ -87,39 +121,39 @@ | |||
| 407 | 87 | <ss:Worksheet ss:Name="Loan Report"> | 121 | <ss:Worksheet ss:Name="Loan Report"> |
| 408 | 88 | <Table x:FullColumns="1" x:FullRows="1"> | 122 | <Table x:FullColumns="1" x:FullRows="1"> |
| 409 | 89 | ## Product Code | 123 | ## Product Code |
| 411 | 90 | <Column ss:AutoFitWidth="1" ss:Width="92.5" /> | 124 | <Column ss:AutoFitWidth="1" ss:Width="102.5" /> |
| 412 | 91 | ## Product Description | 125 | ## Product Description |
| 414 | 92 | <Column ss:AutoFitWidth="1" ss:Width="271.5" /> | 126 | <Column ss:AutoFitWidth="1" ss:Width="301.5" /> |
| 415 | 93 | ## Order Type | 127 | ## Order Type |
| 416 | 94 | <Column ss:AutoFitWidth="1" ss:Width="54.0" /> | 128 | <Column ss:AutoFitWidth="1" ss:Width="54.0" /> |
| 417 | 95 | ## Movement Date | 129 | ## Movement Date |
| 418 | 96 | <Column ss:AutoFitWidth="1" ss:Width="72.25" /> | 130 | <Column ss:AutoFitWidth="1" ss:Width="72.25" /> |
| 419 | 97 | ## Move Ref. | 131 | ## Move Ref. |
| 421 | 98 | <Column ss:AutoFitWidth="1" ss:Width="135.75" /> | 132 | <Column ss:AutoFitWidth="1" ss:Width="105.75" /> |
| 422 | 99 | ## Partner | 133 | ## Partner |
| 423 | 100 | <Column ss:AutoFitWidth="1" ss:Width="135.75" /> | 134 | <Column ss:AutoFitWidth="1" ss:Width="135.75" /> |
| 424 | 101 | ## Partner Type | 135 | ## Partner Type |
| 426 | 102 | <Column ss:AutoFitWidth="1" ss:Width="72.0" /> | 136 | <Column ss:AutoFitWidth="1" ss:Width="65.5" /> |
| 427 | 103 | ## Instance | 137 | ## Instance |
| 429 | 104 | <Column ss:AutoFitWidth="1" ss:Width="112.25" /> | 138 | <Column ss:AutoFitWidth="1" ss:Width="172.25" /> |
| 430 | 105 | ## Qty In | 139 | ## Qty In |
| 432 | 106 | <Column ss:AutoFitWidth="1" ss:Width="54.25" /> | 140 | <Column ss:AutoFitWidth="1" ss:Width="74.25" /> |
| 433 | 107 | ## Qty Out | 141 | ## Qty Out |
| 435 | 108 | <Column ss:AutoFitWidth="1" ss:Width="54.25" /> | 142 | <Column ss:AutoFitWidth="1" ss:Width="74.25" /> |
| 436 | 109 | ## Qty Balance | 143 | ## Qty Balance |
| 438 | 110 | <Column ss:AutoFitWidth="1" ss:Width="54.25" /> | 144 | <Column ss:AutoFitWidth="1" ss:Width="69.25" /> |
| 439 | 111 | ## PO/FO Ref. | 145 | ## PO/FO Ref. |
| 441 | 112 | <Column ss:AutoFitWidth="1" ss:Width="302.0" /> | 146 | <Column ss:AutoFitWidth="1" ss:Width="282.0" /> |
| 442 | 113 | ## Origin Ref. | 147 | ## Origin Ref. |
| 444 | 114 | <Column ss:AutoFitWidth="1" ss:Width="202.0" /> | 148 | <Column ss:AutoFitWidth="1" ss:Width="152.0" /> |
| 445 | 115 | ## Unit Price | 149 | ## Unit Price |
| 446 | 116 | <Column ss:AutoFitWidth="1" ss:Width="57.25" /> | 150 | <Column ss:AutoFitWidth="1" ss:Width="57.25" /> |
| 447 | 117 | ## Currency | 151 | ## Currency |
| 449 | 118 | <Column ss:AutoFitWidth="1" ss:Width="65.75" /> | 152 | <Column ss:AutoFitWidth="1" ss:Width="45.75" /> |
| 450 | 119 | ## Total Value | 153 | ## Total Value |
| 452 | 120 | <Column ss:AutoFitWidth="1" ss:Width="67.25" /> | 154 | <Column ss:AutoFitWidth="1" ss:Width="62.25" /> |
| 453 | 121 | ## Status | 155 | ## Status |
| 455 | 122 | <Column ss:AutoFitWidth="1" ss:Width="67.25" /> | 156 | <Column ss:AutoFitWidth="1" ss:Width="42.25" /> |
| 456 | 123 | 157 | ||
| 457 | 124 | <% | 158 | <% |
| 458 | 125 | headers_list = [ | 159 | headers_list = [ |
| 459 | @@ -149,51 +183,43 @@ | |||
| 460 | 149 | % endfor | 183 | % endfor |
| 461 | 150 | </Row> | 184 | </Row> |
| 462 | 151 | 185 | ||
| 464 | 152 | % for o in getMoves(r): | 186 | <% i = 0 %> |
| 465 | 187 | % for flow in getMoves(r): | ||
| 466 | 188 | <% i = 1 - i %> | ||
| 467 | 189 | % for o in flow: | ||
| 468 | 153 | <Row ss:Height="14.25"> | 190 | <Row ss:Height="14.25"> |
| 472 | 154 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.product_id.default_code|x}</Data></Cell> | 191 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${o.product_id.default_code|x}</Data></Cell> |
| 473 | 155 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.product_id.name|x}</Data></Cell> | 192 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${o.product_id.name|x}</Data></Cell> |
| 474 | 156 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.reason_type_id.name|x}</Data></Cell> | 193 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${o.reason_type_id.name|x}</Data></Cell> |
| 475 | 157 | %if o.date and isDateTime(o.date): | 194 | %if o.date and isDateTime(o.date): |
| 477 | 158 | <Cell ss:StyleID="sShortDate"><Data ss:Type="DateTime">${o.date[:10]|n}T${o.date[-8:]|n}.000</Data></Cell> | 195 | <Cell ss:StyleID="sShortDate${i}"><Data ss:Type="DateTime">${o.date[:10]|n}T${o.date[-8:]|n}.000</Data></Cell> |
| 478 | 159 | % else: | 196 | % else: |
| 480 | 160 | <Cell ss:StyleID="line_left"><Data ss:Type="String"></Data></Cell> | 197 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String"></Data></Cell> |
| 481 | 161 | % endif | 198 | % endif |
| 486 | 162 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.picking_id.name or ''|x}</Data></Cell> | 199 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${o.picking_id.name or ''|x}</Data></Cell> |
| 487 | 163 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.partner_id.name or ''|x}</Data></Cell> | 200 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${o.partner_id.name or ''|x}</Data></Cell> |
| 488 | 164 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.partner_id.partner_type or ''|x}</Data></Cell> | 201 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${o.partner_id.partner_type or ''|x}</Data></Cell> |
| 489 | 165 | <Cell ss:StyleID="line_right"><Data ss:Type="String">${getInstance()|x}</Data></Cell> | 202 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${getUserCompany()['instance_id'].name|x}</Data></Cell> |
| 490 | 166 | % if isQtyOut(o): | 203 | % if isQtyOut(o): |
| 493 | 167 | <Cell ss:StyleID="line_right"><Data ss:Type="String"></Data></Cell> | 204 | <Cell ss:StyleID="line_right${i}"><Data ss:Type="String"></Data></Cell> |
| 494 | 168 | <Cell ss:StyleID="line_right"><Data ss:Type="Number">${getQty(o)|x}</Data></Cell> | 205 | <Cell ss:StyleID="line_right${i}"><Data ss:Type="Number">${getQty(o)|x}</Data></Cell> |
| 495 | 169 | % else: | 206 | % else: |
| 498 | 170 | <Cell ss:StyleID="line_right"><Data ss:Type="Number">${getQty(o)|x}</Data></Cell> | 207 | <Cell ss:StyleID="line_right${i}"><Data ss:Type="Number">${getQty(o)|x}</Data></Cell> |
| 499 | 171 | <Cell ss:StyleID="line_right"><Data ss:Type="String"></Data></Cell> | 208 | <Cell ss:StyleID="line_right${i}"><Data ss:Type="String"></Data></Cell> |
| 500 | 172 | % endif | 209 | % endif |
| 501 | 173 | % if o.balance: | 210 | % if o.balance: |
| 503 | 174 | <Cell ss:StyleID="line_right"><Data ss:Type="String">${o.balance|x}</Data></Cell> | 211 | <Cell ss:StyleID="line_right${i}"><Data ss:Type="Number">${o.balance|x}</Data></Cell> |
| 504 | 175 | % else: | 212 | % else: |
| 506 | 176 | <Cell ss:StyleID="line_right"><Data ss:Type="String"></Data></Cell> | 213 | <Cell ss:StyleID="line_right${i}"><Data ss:Type="String"></Data></Cell> |
| 507 | 177 | %endif | 214 | %endif |
| 526 | 178 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.origin|x}</Data></Cell> | 215 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${o.origin|x}</Data></Cell> |
| 527 | 179 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.purchase_line_id.sync_order_line_db_id or o.sale_line_id.sync_order_line_db_id or ''|x}</Data></Cell> | 216 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${getFirstSplitOnUnderscore(o.purchase_line_id.sync_order_line_db_id) or getFirstSplitOnUnderscore(o.sale_line_id.sync_order_line_db_id) or ''|x}</Data></Cell> |
| 528 | 180 | % if o.price_unit: | 217 | <Cell ss:StyleID="line_right${i}"><Data ss:Type="Number">${computeCurrency(o)|x}</Data></Cell> |
| 529 | 181 | <Cell ss:StyleID="line_right"><Data ss:Type="Number">${round(o.price_unit, 3)|x}</Data></Cell> | 218 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${getUserCompany()['currency_id'].name|x}</Data></Cell> |
| 530 | 182 | % else: | 219 | <Cell ss:StyleID="line_right${i}"><Data ss:Type="Number">${computeCurrency(o) * getQty(o)|x}</Data></Cell> |
| 531 | 183 | <Cell ss:StyleID="line_right"><Data ss:Type="Number">${round(o.product_id.standard_price, 3)|x}</Data></Cell> | 220 | <Cell ss:StyleID="line_left${i}"><Data ss:Type="String">${o.status|x}</Data></Cell> |
| 514 | 184 | % endif | ||
| 515 | 185 | % if o.price_currency_id.name: | ||
| 516 | 186 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.price_currency_id.name|x}</Data></Cell> | ||
| 517 | 187 | % else: | ||
| 518 | 188 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.product_id.currency_id.name or ''|x}</Data></Cell> | ||
| 519 | 189 | % endif | ||
| 520 | 190 | % if o.price_unit: | ||
| 521 | 191 | <Cell ss:StyleID="line_right"><Data ss:Type="Number">${round(o.price_unit, 3) * getQty(o)|x}</Data></Cell> | ||
| 522 | 192 | % else: | ||
| 523 | 193 | <Cell ss:StyleID="line_right"><Data ss:Type="Number">${round(o.product_id.standard_price, 3) * getQty(o)|x}</Data></Cell> | ||
| 524 | 194 | % endif | ||
| 525 | 195 | <Cell ss:StyleID="line_left"><Data ss:Type="String">${o.status|x}</Data></Cell> | ||
| 532 | 196 | </Row> | 221 | </Row> |
| 533 | 222 | % endfor | ||
| 534 | 197 | % endfor | 223 | % endfor |
| 535 | 198 | 224 | ||
| 536 | 199 | </Table> | 225 | </Table> |
