Laurent Destailleur
|
8ab96447c7
|
Page of permissions is cleaner now
|
2020-02-05 21:31:28 +01:00 |
|
Laurent Destailleur
|
f5129c87d2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-05 19:38:52 +01:00 |
|
Laurent Destailleur
|
cca62dd8d3
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-05 19:38:25 +01:00 |
|
Laurent Destailleur
|
1ef978ccc4
|
FIX #12966
|
2020-02-05 19:32:49 +01:00 |
|
Laurent Destailleur
|
4f3cc87077
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:38 +01:00 |
|
Laurent Destailleur
|
30fa8940a9
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:00 +01:00 |
|
Laurent Destailleur
|
80f4e625be
|
Fix phpcs
|
2020-02-05 17:07:42 +01:00 |
|
Laurent Destailleur
|
f3e27695e2
|
FIX Avoid deletion of bank record if in accounting
|
2020-02-05 16:35:50 +01:00 |
|
Laurent Destailleur
|
44ed5980f5
|
FIX Avoid deletion of bank record if in accounting
|
2020-02-05 16:35:09 +01:00 |
|
Laurent Destailleur
|
2e0929c2e9
|
FIX export ledger
|
2020-02-05 16:08:28 +01:00 |
|
Laurent Destailleur
|
e81bcbde31
|
FIX export ledger
|
2020-02-05 16:08:00 +01:00 |
|
Laurent Destailleur
|
fdfc45bbe9
|
Fix wrapping
|
2020-02-05 15:04:11 +01:00 |
|
Laurent Destailleur
|
a2bb64354b
|
Fix bad merge
|
2020-02-05 14:56:01 +01:00 |
|
Laurent Destailleur
|
c09009d088
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-05 14:53:54 +01:00 |
|
Laurent Destailleur
|
1875b6a49b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
|
2020-02-05 14:53:47 +01:00 |
|
Laurent Destailleur
|
1fe9783760
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/product/index.php
|
2020-02-05 14:38:19 +01:00 |
|
Laurent Destailleur
|
4d58dd05aa
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-05 14:31:07 +01:00 |
|
Laurent Destailleur
|
9515467300
|
Merge pull request #13005 from RubenRuCh/11.0
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
|
2020-02-05 14:30:40 +01:00 |
|
Laurent Destailleur
|
08d85f9acb
|
Merge pull request #13009 from TobiasSekan/NewShowCategoryCount
NEW Show count of each category elements in category card
|
2020-02-05 14:19:37 +01:00 |
|
Laurent Destailleur
|
56012405ff
|
Merge pull request #13006 from TobiasSekan/NewShowUsersOfCategory
NEW Show list of users in the user category card
|
2020-02-05 14:19:06 +01:00 |
|
Tobias Sekan
|
eca0016778
|
Fix wrong category name on user category card
|
2020-02-05 14:17:41 +01:00 |
|
Laurent Destailleur
|
5eea3292dc
|
Merge pull request #13004 from TobiasSekan/FixWrongCategoryName
[Fix] Wrong user category name
|
2020-02-05 14:17:14 +01:00 |
|
Laurent Destailleur
|
c015707cbc
|
Fix Only dolibarr logos are in root of theme
|
2020-02-05 14:14:59 +01:00 |
|
andreubisquerra
|
220f02805d
|
Update image path after move image directory
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
Conflicts:
htdocs/core/class/dolreceiptprinter.class.php
|
2020-02-05 14:12:29 +01:00 |
|
Laurent Destailleur
|
320dd69923
|
Merge pull request #13002 from andreubisquerra/develop
Update image path after move image directory
|
2020-02-05 14:10:12 +01:00 |
|
Laurent Destailleur
|
5a81e3e181
|
Merge pull request #13012 from ptibogxiv/patch-299
fix url field in edit mode societe/card.php
|
2020-02-05 14:09:04 +01:00 |
|
Laurent Destailleur
|
a36cf1f86b
|
Fix phpunit
|
2020-02-05 14:08:13 +01:00 |
|
Laurent Destailleur
|
ddd1ca26b9
|
CSS
|
2020-02-05 14:04:19 +01:00 |
|
Laurent Destailleur
|
db43b2d3dd
|
Fix unique key on llx_holiday_users
|
2020-02-05 13:53:35 +01:00 |
|
Laurent Destailleur
|
334c69841a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-05 13:41:30 +01:00 |
|
Laurent Destailleur
|
796cdad6fc
|
Merge pull request #13008 from hregis/10.0_mc
FIX compatibility with multicompany (avoid duplicate data)
|
2020-02-05 13:41:20 +01:00 |
|
Laurent Destailleur
|
9100b8a548
|
FIX SQL request and phpunit
|
2020-02-05 13:41:10 +01:00 |
|
Laurent Destailleur
|
c101c3dd55
|
Update holiday.class.php
|
2020-02-05 13:27:22 +01:00 |
|
Laurent Destailleur
|
d35994e5db
|
Update holiday.class.php
|
2020-02-05 13:25:51 +01:00 |
|
Laurent Destailleur
|
b589db813e
|
Merge pull request #13029 from OPEN-DSI/v10-fix-product-index-links
FIX links in products/services index
|
2020-02-05 13:05:35 +01:00 |
|
Laurent Destailleur
|
0315b53f1f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-05 13:03:54 +01:00 |
|
Laurent Destailleur
|
bd90cdf492
|
FIX #13023
|
2020-02-05 13:03:43 +01:00 |
|
Laurent Destailleur
|
2cf970f617
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-05 12:51:54 +01:00 |
|
Laurent Destailleur
|
f8daed7f56
|
Update company.lib.php
|
2020-02-05 12:49:56 +01:00 |
|
Laurent Destailleur
|
8051e916c0
|
Merge pull request #13017 from andreubisquerra/develop
Add bold tags to Receipt Printers module
|
2020-02-05 12:40:07 +01:00 |
|
Laurent Destailleur
|
63ba601906
|
Update box_project.php
|
2020-02-05 12:39:00 +01:00 |
|
Tobias Sekan
|
efcd4d0c63
|
Fix unset gender property in contact class
|
2020-02-05 12:34:29 +01:00 |
|
Laurent Destailleur
|
a11ef1c606
|
Merge pull request #13020 from TobiasSekan/FixGenderPhotoInContactCard
[Fix] Missing gender photo in contact card
|
2020-02-05 12:22:35 +01:00 |
|
ptibogxiv
|
94fd2b40c7
|
new fix Count of Stripe payment mode must take test/live into account
fix error message for if no stripe enabled 0b891d5e0c
|
2020-02-05 12:04:27 +01:00 |
|
VESSILLER
|
c3cf9e62b3
|
FIX links in products/services index
|
2020-02-05 11:31:02 +01:00 |
|
Laurent Destailleur
|
373b4ca0d9
|
Use constant
|
2020-02-05 10:59:32 +01:00 |
|
Pierre Ardoin
|
81ed70ffc7
|
Update box_project.php
|
2020-02-05 09:18:39 +01:00 |
|
Pierre Ardoin
|
d5b74a8ca3
|
Update box_project.php
|
2020-02-05 09:06:43 +01:00 |
|
Pierre Ardoin
|
262d889700
|
Update box_project.php
|
2020-02-05 08:50:51 +01:00 |
|
Laurent Destailleur
|
0b891d5e0c
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:47 +01:00 |
|