Commit graph

273 commits

Author SHA1 Message Date
Cayo Puigdefabregas 83bdf79514 add render views for delivery and receiver notes 2022-06-06 13:37:58 +02:00
Cayo Puigdefabregas e635abdbbc views of delivery note and receiver note 2022-06-03 20:01:13 +02:00
Cayo Puigdefabregas 88a0bdd44d resolv conflicts 2022-06-03 11:34:49 +02:00
Cayo Puigdefabregas ad7848edc6 add snapshotLog in old api 2022-06-03 11:06:49 +02:00
Cayo Puigdefabregas cce7dbfdf1 add view for advanced search 2022-06-02 13:46:10 +02:00
Cayo Puigdefabregas f58993c9d1 resolve conflicts 2022-06-01 15:01:02 +02:00
Cayo Puigdefabregas 29313e3470 add colors to open and closed 2022-06-01 13:26:17 +02:00
Cayo Puigdefabregas 96680937e9 add arrow right 2022-06-01 13:14:27 +02:00
Cayo Puigdefabregas e1e38015ee fix 2022-06-01 12:34:48 +02:00
Cayo Puigdefabregas ef36c11f6b change names of vars 2022-06-01 11:54:02 +02:00
Cayo Puigdefabregas f8f1276313 add description in transfer 2022-06-01 11:09:28 +02:00
Cayo Puigdefabregas dbd5645c94 show transfers if there are transfer 2022-05-31 16:28:38 +02:00
Cayo Puigdefabregas 9ca5ce48d1 add edit transfer 2022-05-30 16:32:25 +02:00
Cayo Puigdefabregas a8368e92b8 add html and form for transfers 2022-05-27 16:32:22 +02:00
Cayo Puigdefabregas ebe800158a modify updated and add registered 2022-05-25 17:37:24 +02:00
Cayo Puigdefabregas 83067fd2bb modify updated and add registered 2022-05-25 17:33:54 +02:00
Santiago L 7d7507c1d9
Merge pull request #273 from RubenPX/feature/lots-search
Feature: lots-search US 3334
2022-05-23 13:39:42 +02:00
RubenPX c0a7415f33
Update ereuse_devicehub/templates/inventory/device_list.html
Co-authored-by: Santiago L <santiago@ribaguifi.com>
2022-05-21 10:58:40 +02:00
Cayo Puigdefabregas 6ecbd4e09d add details of one entry snapshot log 2022-05-19 18:16:47 +02:00
Cayo Puigdefabregas 744b14f286 join all snapshots logs in one for every uuid 2022-05-19 13:48:52 +02:00
Cayo Puigdefabregas 0bc75ec547 add get_status 2022-05-18 18:26:01 +02:00
Cayo Puigdefabregas 04969ad939 clean template 2022-05-18 18:02:38 +02:00
Cayo Puigdefabregas c0abfd6f0b change version 2022-05-18 12:46:57 +02:00
Cayo Puigdefabregas 99309162e3 change templates 2022-05-18 11:01:23 +02:00
Cayo Puigdefabregas bf547b6f80 Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113 2022-05-17 09:23:31 +02:00
Cayo Puigdefabregas d935c987b3 comiter monitor instead of monitor 2022-05-16 12:40:14 +02:00
Cayo Puigdefabregas 727c06c3de add public link to device list 2022-05-16 11:54:02 +02:00
Cayo Puigdefabregas c1665ef4af Merge branch 'testing' into feature/#3396-add-columns-status 2022-05-16 10:16:23 +02:00
cayop 282b9490fb
Merge pull request #265 from eReuse/feature/#3100-wb-settings
Feature/#3100 wb settings
2022-05-16 10:18:45 +02:00
RubenPX adde4f88e4 add lots search interface 2022-05-13 21:27:50 +02:00
Cayo Puigdefabregas 11913d68c3 fix state instead of states 2022-05-13 17:16:08 +02:00
Cayo Puigdefabregas 1dcebc0112 #3401 change the values of the status in the page of device details 2022-05-13 13:11:00 +02:00
Cayo Puigdefabregas d8c9bcbcf7 #3400 change the names of the status for the correct names 2022-05-13 13:06:04 +02:00
Cayo Puigdefabregas 1b5f6412f0 #3397 add columns of status in the devices list 2022-05-13 12:17:14 +02:00
Santiago L af833a673a
Merge pull request #272 from RubenPX/Show-device-labels
Show lots on deviceList
2022-05-13 10:41:55 +02:00
Santiago L 56ccb7591a Cosmetics: display lots inline & use ligh bg
Lower visual weight because it's secundary information
2022-05-13 10:39:37 +02:00
Santiago L 300edac5a8 Dropped .badge-pill use the .rounded-pill utility instead.
Breaking change on Boostrap 5
https://getbootstrap.com/docs/5.0/migration/#badges
2022-05-13 10:35:11 +02:00
Santiago L a444579c05
Merge pull request #271 from eReuse/feature/all-device-list
Feature: 3196 all device list
2022-05-13 10:26:49 +02:00
Santiago L d54f2166dc Keep unassigned as default option on device list
Unassigned devices are the ones that require user attention and
also all devices view will generate larger responses and more
server load.
2022-05-13 10:22:32 +02:00
RubenPX 6a408a08c7 set const table to var
This allow modify variable
2022-05-12 18:44:26 +02:00
cayop 5026768eb5
Merge pull request #269 from eReuse/bugfix/allocate-bugs
Bugfix/allocate bugs
2022-05-12 17:38:37 +02:00
Cayo Puigdefabregas 763d2d1361 minimalistic settings 2022-05-12 17:19:22 +02:00
Santiago L 4406c78aed Merge branch 'testing' into feature/all-device-list 2022-05-12 14:49:22 +02:00
Santiago L 8f3bdb71fe Add "All devices" item to sidebar menu 2022-05-12 14:44:02 +02:00
Santiago L 290c260511 Update breadcrum: All devices VS Unassigned 2022-05-12 14:43:41 +02:00
Cayo Puigdefabregas b927e1ac54 Merge branch 'testing' into feature/#3100-wb-settings 2022-05-12 11:57:55 +02:00
Cayo Puigdefabregas 0e974c0e92 add tags in device list 2022-05-12 11:33:28 +02:00
Cayo Puigdefabregas fee1d6787c add column created and put order descendent from created field 2022-05-12 11:03:48 +02:00
Cayo Puigdefabregas 515f31c562 fixed bug #3387 2022-05-12 10:15:46 +02:00
Santiago L 80d18e34a8
Merge pull request #256 from RubenPX/makingPublic-fields
fix code issues & add support to old browsers
2022-05-11 18:38:14 +02:00