ksar
|
b5da9763ce
|
Update export_files.php
Remove Warning
|
2020-02-06 12:15:18 +01:00 |
|
Laurent Destailleur
|
48e6db17bd
|
Fix doc
|
2020-02-06 10:28:49 +01:00 |
|
Laurent Destailleur
|
2966b2303b
|
Fix phpcs
|
2020-02-06 10:23:04 +01:00 |
|
Laurent Destailleur
|
48cd8e1314
|
Fix doc
|
2020-02-06 10:17:06 +01:00 |
|
Laurent Destailleur
|
40b6886e2a
|
Fix params
|
2020-02-06 10:09:27 +01:00 |
|
Laurent Destailleur
|
f3597926c4
|
Fix missing escape returned by ci
|
2020-02-06 10:05:13 +01:00 |
|
Laurent Destailleur
|
4ee760856b
|
Merge pull request #13034 from oscim/patch-18
ref_ext is not in sql requete for save
|
2020-02-05 22:47:08 +01:00 |
|
oscim
|
7cc87423e4
|
ref_ext is not in sql requete for save
ref_ext is not in sql requete for save
|
2020-02-05 22:31:27 +01:00 |
|
Laurent Destailleur
|
5aa4f9b5ae
|
Fix phpcs
|
2020-02-05 21:58:53 +01:00 |
|
Laurent Destailleur
|
0e790bd8fc
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-05 21:47:54 +01:00 |
|
Laurent Destailleur
|
7411f6468b
|
css
|
2020-02-05 21:47:41 +01:00 |
|
Laurent Destailleur
|
1344ce06a5
|
Merge pull request #12317 from OPEN-DSI/new-propal-tooltip-note
NEW add public and private notes in propal list
|
2020-02-05 21:41:17 +01:00 |
|
Laurent Destailleur
|
66590cca10
|
Update list.php
|
2020-02-05 21:40:49 +01:00 |
|
Laurent Destailleur
|
95f1cd0d66
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-05 21:31:41 +01:00 |
|
Laurent Destailleur
|
8ab96447c7
|
Page of permissions is cleaner now
|
2020-02-05 21:31:28 +01:00 |
|
Laurent Destailleur
|
dbb731a656
|
Merge pull request #12957 from TobiasSekan/AddTempWorkFolder
NEW Hidden option MAIN_TEMP_DIR
|
2020-02-05 20:43:26 +01:00 |
|
Laurent Destailleur
|
4a07740601
|
Update conf.class.php
|
2020-02-05 20:42:44 +01:00 |
|
Laurent Destailleur
|
7cc959e316
|
Update conf.class.php
|
2020-02-05 20:42:03 +01:00 |
|
stickler-ci
|
1ecef695f8
|
Fixing style errors.
|
2020-02-05 19:40:22 +00:00 |
|
Laurent Destailleur
|
3e73e97f24
|
Update conf.class.php
|
2020-02-05 20:39:38 +01:00 |
|
Laurent Destailleur
|
98ac0428a5
|
Update conf.class.php
|
2020-02-05 20:37:49 +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 |
|