lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
82,359 Commits 43 Branches 150 Tags 886 MiB
22d4f37e58
Commit Graph

82359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
22d4f37e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
ee8cc894cd Fix screenshot 2020-01-10 14:27:40 +01:00
Laurent Destailleur
b05a49b284 Fix link to screenshot 2020-01-10 14:26:18 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
Laurent Destailleur
efb506ba7f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-10 13:51:35 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
 2020-01-10 13:51:29 +01:00
Laurent Destailleur
9ebdd82edb Fix We must refuse to delete a various payment if payment was dispatched 
in accountancy.
 2020-01-10 02:43:24 +01:00
Laurent Destailleur
675ce3b32f Fix sql error on update of subledger account on a various payment 
Fix warning message that was not accurate
 2020-01-10 02:20:08 +01:00
Laurent Destailleur
dd930fe791 Can disable a not expected behaviour on price propagation 2020-01-10 01:07:58 +01:00
Frédéric FRANCE
7bea60af84 can replace formconfirm in order supplier 2020-01-10 00:27:40 +01:00
Frédéric FRANCE
47ee03acdc Update odf.php 2020-01-10 00:26:46 +01:00
Frédéric FRANCE
188024339d Update choix_date.php 2020-01-10 00:25:46 +01:00
Frédéric FRANCE
f8f45be225 Update choix_autre.php 2020-01-10 00:25:42 +01:00
Frédéric FRANCE
095336f333 Update create_survey.php 2020-01-10 00:25:37 +01:00
Frédéric FRANCE
90b4a4d314 Update index.php 2020-01-10 00:25:31 +01:00
Laurent Destailleur
22b6828e09
Merge pull request #12792 from aspangaro/12.0_a5 
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
 2020-01-10 00:23:54 +01:00
Laurent Destailleur
940a9fc800
Merge pull request #12823 from frederic34/patch-18 
add newtoken in create survey
 2020-01-10 00:22:21 +01:00
Laurent Destailleur
4f2f2f0d73
Merge pull request #12815 from artis-auxilium/fix_massaction_checkbox 
Fix massaction checkbox when product module disable
 2020-01-10 00:22:02 +01:00
Laurent Destailleur
a378cee1e0
Merge pull request #12814 from frederic34/patch-17 
Update odf.php
 2020-01-10 00:19:57 +01:00
Laurent Destailleur
e36bf0261c
Merge pull request #12811 from simicar29/develop 
Avoid adding unsubscribed contacts in mailing list
 2020-01-10 00:18:12 +01:00
Laurent Destailleur
286d278125
Merge pull request #12816 from artis-auxilium/fix_massaction_check 
Fix Check array of action after kooks
 2020-01-10 00:16:21 +01:00
Laurent Destailleur
b93247aeec
Merge pull request #12819 from atm-arnaud/FIX_stats_invoices_with_draft 
FIX drafts are now implemented for stats
 2020-01-10 00:15:13 +01:00
Laurent Destailleur
896845eaa5
Merge pull request #12828 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2020-01-10 00:14:37 +01:00
Laurent Destailleur
ba9e584299
Merge pull request #12827 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2020-01-10 00:14:26 +01:00
Laurent Destailleur
819a7dda31
Merge pull request #12808 from frederic34/patch-15 
can replace formconfirm in order supplier
 2020-01-10 00:14:07 +01:00
Laurent Destailleur
bc8dfd46c2
Merge pull request #12810 from ATM-Consulting/10.0_Fix_folder_rename_behavior 
Fix folder rename behavior
 2020-01-10 00:11:47 +01:00
Laurent Destailleur
e18282ac1e
Merge pull request #12807 from ptibogxiv/patch-292 
FIX: multicompany for discount
 2020-01-10 00:09:16 +01:00
Laurent Destailleur
190d8368e8
Merge pull request #12821 from laudeco/hotfix/docker-ziparchive 
make the docker supports ZipArchive
 2020-01-10 00:08:49 +01:00
Laurent Destailleur
b7b87929d0
Merge branch 'develop' into hotfix/docker-ziparchive 2020-01-10 00:08:27 +01:00
Laurent Destailleur
91078d6d0f
Merge pull request #12822 from laudeco/hotfix/barcode-initiator 
fix the init of the barcode
 2020-01-10 00:07:38 +01:00
Laurent Destailleur
3916c53337
Update codeinit.php 2020-01-10 00:07:26 +01:00
Laurent Destailleur
54b37de333
Merge pull request #12804 from frederic34/patch-13 
doxygen
 2020-01-10 00:05:08 +01:00
Scrutinizer Auto-Fixer
8691194627 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-09 23:03:10 +00:00
Scrutinizer Auto-Fixer
52dbd95223 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-09 23:02:05 +00:00
Laurent Destailleur
78dcf91f02 Fix bad link 2020-01-09 22:42:31 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
f9262b0dcf Transifex sync 2020-01-09 22:30:00 +01:00
Laurent Destailleur
0e58edd896 Fix modulebuilder 2020-01-09 22:27:24 +01:00
Laurent Destailleur
e8e82ca08c Standardize columns 2020-01-09 20:11:03 +01:00
Laurent Destailleur
f25ac50e3b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-09 17:29:01 +01:00
Laurent Destailleur
c6c321b004 Fix website when ckeditor is off 2020-01-09 17:28:08 +01:00
Laurent Destailleur
8b696970a7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-09 17:17:28 +01:00
Laurent Destailleur
cef38016bb Trans 2020-01-09 17:16:30 +01:00
Laurent Destailleur
cee4fe79a3 Update doc 2020-01-09 12:50:04 +01:00
Laurent Destailleur
255c280170 Fix visibility 2020-01-09 11:44:15 +01:00
Laurent Destailleur
20b63b702e Fix visibility 2020-01-09 11:42:57 +01:00
Laurent Destailleur
115b7f2c6b Fix break on second column 2020-01-09 11:05:23 +01:00
Laurent Destailleur
60935b93c0 Fix break on second column 2020-01-09 11:04:58 +01:00
Frédéric FRANCE
b65e39b5cf
Update choix_date.php 2020-01-09 11:04:53 +01:00