lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,312 Commits 43 Branches 150 Tags 886 MiB
e408ea463c
Commit Graph

83312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
oscim
e408ea463c
report and apply GETPOST method for $datev and $datep 
fix for usage GETPOST() for input  $datev and $datep
And report definition $datev and $datep in top ection file for support GET params for action create
 2020-02-07 09:31:58 +01:00
Laurent Destailleur
5e71366ff2 css 2020-02-06 18:06:36 +01:00
Laurent Destailleur
9c73bb1aef NEW Can create an deposit from order using a percentage of qty. 2020-02-06 14:15:41 +01:00
Laurent Destailleur
c8f7b79c48 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:05:52 +01:00
Laurent Destailleur
19847ec7ac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:04:49 +01:00
Laurent Destailleur
e14612f569 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:02:27 +01:00
Laurent Destailleur
13442ef0df FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
 2020-02-06 13:01:09 +01:00
Laurent Destailleur
05e08b3596 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
 2020-02-06 12:58:02 +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
857c22cb29 Fix doc 2020-02-06 10:13:10 +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
1543028cdb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-05 19:38:02 +01:00
Laurent Destailleur
b6efd098dd Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-05 19:37:03 +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