Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,408 Commits 36 Branches 189 Tags
9c4ba1c5d2b51b2d25868f45c4ccfd7296b1722c
Commit Graph

83408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
9c4ba1c5d2 Update greetings.yml 2020-02-10 01:50:32 +01:00
Laurent Destailleur
dbffaf3c1e Create greetings file for new PR submiters 2020-02-10 01:50:13 +01:00
Laurent Destailleur
3baf0e66b9 Trans 2020-02-10 01:11:52 +01:00
Laurent Destailleur
ecb1f1f2d7 Responsive 2020-02-10 01:01:22 +01:00
Laurent Destailleur
70c19fedeb Responsive 2020-02-10 00:47:44 +01:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
18d332994f FIX Mail smtps truncated if content has a line with single . 2020-02-09 15:51:43 +01:00
Laurent Destailleur
5d04775164 Fix missing categorie class 2020-02-09 15:14:01 +01:00
Laurent Destailleur
1ee959a11f Generic graph 2020-02-08 17:46:41 +01:00
Laurent Destailleur
33addfab01 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:21:17 +01:00
Laurent Destailleur
3852ba0655 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:16:25 +01:00
Laurent Destailleur
81df5cd9ab Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering 
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
 2020-02-08 17:16:01 +01:00
Laurent Destailleur
aed3ea25cb Code comment 2020-02-08 17:14:04 +01:00
Laurent Destailleur
3dfe7161cf Merge pull request #13035 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2020-02-08 17:09:25 +01:00
Laurent Destailleur
59e0ab9e04 Fix AT-BASE 2020-02-08 17:08:45 +01:00
Laurent Destailleur
4599c5557d Merge pull request #13066 from homer8173/patch-18 
accounting austrian
 2020-02-08 16:28:47 +01:00
Laurent Destailleur
665876ffa4 Merge pull request #13061 from andreubisquerra/develop 
Add and finish receipt printer tags
 2020-02-08 16:19:44 +01:00
pnueda
c083458adf Update html.formfile.class.php 
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
 2020-02-08 16:18:52 +01:00
Laurent Destailleur
c9f7dacda1 Merge pull request #13060 from pnueda/patch-1 
Update html.formfile.class.php
 2020-02-08 16:18:17 +01:00
Laurent Destailleur
8bcff9a0f1 Merge pull request #13052 from fappels/11_fix_expedition_ceate_line 
FIX expedition ceate line new parameter is not required.
 2020-02-08 16:07:36 +01:00
Laurent Destailleur
ee29c3efdd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 16:02:23 +01:00
Laurent Destailleur
5f507b2df5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 16:01:41 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
c27260869b FIX #13046 More complete 2020-02-08 15:59:08 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-02-08 15:42:35 +01:00
Laurent Destailleur
1a167aa5b4 Update card.php 
Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 15:12:55 +01:00
Laurent Destailleur
9b9101dc2f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/tools/export_files.php
 2020-02-08 15:09:24 +01:00
Laurent Destailleur
10790420ba Merge pull request #13051 from oscim/patch-19 
report and apply  GETPOST method for $datev and $datep
 2020-02-08 15:07:18 +01:00
Laurent Destailleur
544e05a7dd Update card.php 2020-02-08 15:06:45 +01:00
Laurent Destailleur
5f5645a184 Merge pull request #13044 from ksar-ksar/10.0 
FIX : Warning on admin/export_files
 2020-02-08 15:05:44 +01:00
Laurent Destailleur
34192f25f6 Merge pull request #13042 from ksar-ksar/11.0 
FIX : Update export_files.php
 2020-02-08 15:05:26 +01:00
ksar
e951743077 Update export_files.php 
Remove Warning
 2020-02-08 15:04:27 +01:00
Laurent Destailleur
2a897ac91a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:02:49 +01:00
Laurent Destailleur
f28da6a602 Merge pull request #13041 from ksar-ksar/develop 
FIX : Warning on admin/export_files
 2020-02-08 15:01:30 +01:00
Laurent Destailleur
5fac824824 Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing 
FIX advanced target emailing sql and ergonomy
 2020-02-08 14:59:00 +01:00
ptibogxiv
8100708639 Update pdf_espadon.modules.php 2020-02-08 14:57:04 +01:00
ptibogxiv
ae5da164c6 FIX need weight short label in shipping doc 
need short label because value + term is too long
 2020-02-08 14:56:36 +01:00
Laurent Destailleur
9a21aa1722 Merge pull request #13036 from ptibogxiv/patch-301 
FIX : short label in shipping pdf
 2020-02-08 14:54:44 +01:00
Laurent Destailleur
b66c2a29a2 Merge branch 'develop' into patch-301 2020-02-08 14:54:23 +01:00
Laurent Destailleur
46e7f613fd Merge pull request #13049 from hregis/11.0 
FIX #13028
 2020-02-08 14:52:57 +01:00
Laurent Destailleur
85c4013a0d Update card.php 2020-02-08 14:52:02 +01:00
Laurent Destailleur
9c12c4be08 Fix customreports 2020-02-08 14:49:26 +01:00
Laurent Destailleur
3a74c3d7e9 Enhance property ->ismulticompanymanaged to define an object with entity 
on its parent.
 2020-02-08 14:40:30 +01:00
Laurent Destailleur
c3beb854a2 Definition of $fields for member and subscriptions 2020-02-08 13:44:31 +01:00
Laurent Destailleur
5f75ae4830 FIX If we can change vendor status, we must be able to chane vendor code 2020-02-08 11:34:57 +01:00
Laurent Destailleur
56079f928f Label of field 2020-02-08 11:34:25 +01:00
Laurent Destailleur
cffc56b80b Declaration of property fields of thirdparties 2020-02-08 11:32:38 +01:00
Laurent Destailleur
02a96e163f FIX If we can change vendor status, we must be able to chane vendor code 2020-02-08 11:26:16 +01:00
Norbert Penel
c29a7527ad accounting austrian 2020-02-08 10:19:38 +01:00
andreubisquerra
1e5940fbf0 Fix travis errors 2020-02-07 19:25:28 +01:00