lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,672 Commits 43 Branches 150 Tags 886 MiB
3ebfb23407
Commit Graph

68672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:22:50 +02:00
Laurent Destailleur
d40e1a0d0b FIX #9258 2018-08-29 20:12:38 +02:00
Laurent Destailleur
8b291b2053 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	README.md
 2018-08-29 19:55:10 +02:00
Laurent Destailleur
46fe19bed5 Code comment 2018-08-29 18:56:57 +02:00
Laurent Destailleur
0c11007e34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	README.md
	htdocs/comm/propal/card.php
 2018-08-29 18:53:39 +02:00
Laurent Destailleur
e317b0847a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	README.md
 2018-08-29 18:50:00 +02:00
Laurent Destailleur
7af083f1ec Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-29 18:49:08 +02:00
Laurent Destailleur
34ceec7067 FIX #9328 2018-08-29 18:40:12 +02:00
Laurent Destailleur
4e7e290624 FIX #9328 2018-08-29 18:38:58 +02:00
Laurent Destailleur
428354303c FIX #9328 2018-08-29 18:29:42 +02:00
Laurent Destailleur
d8bd76b8ce FIX #9328 2018-08-29 18:27:39 +02:00
Laurent Destailleur
275b9a9960
Merge pull request #9325 from frederic34/patch-12 
Fix allow barcode with special char
 2018-08-29 18:01:15 +02:00
Laurent Destailleur
46a24ff28f
Merge pull request #9321 from atm-gauthier/6.0_fix_default_bank_on_create_propal 
FIX : $fk_account is always empty, must be $soc->fk_account
 2018-08-29 17:56:36 +02:00
ptibogxiv
b9179f27a0 Fix multicompany in ticket/list.php 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2018-08-29 17:55:55 +02:00
Laurent Destailleur
42f509119f
Merge pull request #9315 from frederic34/patch-11 
Build Badge for 8.0
 2018-08-29 17:50:22 +02:00
Laurent Destailleur
4d8424f9eb
Merge pull request #9314 from frederic34/patch-10 
Build Badge for 7.0
 2018-08-29 17:50:10 +02:00
Laurent Destailleur
cb24fa0f08
Merge pull request #9310 from frederic34/patch-9 
Build Badge for 6.0
 2018-08-29 17:50:04 +02:00
Laurent Destailleur
a5a629fd0f Fix phpcs 2018-08-29 17:44:44 +02:00
Laurent Destailleur
4450a14c75 Comment 2018-08-29 17:40:19 +02:00
Laurent Destailleur
7bf48b8d77 Fix date_start and date_end not saved on supplier invoice 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2018-08-29 17:26:41 +02:00
Laurent Destailleur
2daa5b3ae0 Fix phpcs 2018-08-29 17:09:58 +02:00
Laurent Destailleur
98356c6ed0 Fix date_start and date_end not saved on supplier invoice 2018-08-29 17:03:18 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00
Laurent Destailleur
74b3e3e814 Fix for compatibility with lines with no prices (some external modules) 2018-08-29 14:50:12 +02:00
Frédéric FRANCE
24be0b7305
Update viewimage.php 
code may have rich content (qrcode, datamatrix,...)
 2018-08-29 13:08:52 +02:00
Laurent Destailleur
b648a28893 Fix regression 2018-08-29 11:57:43 +02:00
Laurent Destailleur
0eb4f8bb96 NEW Can set the datestart and dateend of cron job into module descriptor 2018-08-29 11:47:20 +02:00
Laurent Destailleur
1b542d5be3 Fix translation 2018-08-28 18:36:46 +02:00
Laurent Destailleur
b5c2383f65 Fix type of invoice encoded twice 2018-08-28 18:34:53 +02:00
Laurent Destailleur
d2d28ab109 Fix trans 2018-08-28 18:28:09 +02:00
Laurent Destailleur
bc31fa7fbf Fix translation 2018-08-28 18:18:04 +02:00
gauthier
61a57e619f FIX : $fk_account is always empty, must be $soc->fk_account 2018-08-28 16:54:04 +02:00
Laurent Destailleur
fde9c94b1c Fix regression in media editor in websites 2018-08-28 14:21:58 +02:00
Laurent Destailleur
bbc6255925 Fix missing language 2018-08-28 13:07:48 +02:00
Frédéric FRANCE
d25f8d8bbd
Build Badge for 8.0 2018-08-28 10:08:09 +02:00
Frédéric FRANCE
055b7392d0
Build Badge for 7.0 2018-08-28 10:07:09 +02:00
Frédéric FRANCE
53e476483c
Build Badge for 6.0 2018-08-28 09:38:24 +02:00
Laurent Destailleur
b875abb27b Fix logo on public page of survey 2018-08-28 03:03:05 +02:00
Laurent Destailleur
2349f99eb9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 02:58:51 +02:00
Laurent Destailleur
7df5993ee0 Fix logo in public survey page 2018-08-28 02:58:14 +02:00
Laurent Destailleur
50d50c2e10
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info 
NEW On customer/supplier card, add simple tooltip to amount boxes
 2018-08-28 02:48:05 +02:00
Laurent Destailleur
45e30271b3 Merge 2018-08-28 02:37:06 +02:00
Laurent Destailleur
9c6ce4b29d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-28 02:36:15 +02:00
Laurent Destailleur
9a14611d55
Merge pull request #8996 from grandoc/new_branch_20_06_2018 
clean and update code
 2018-08-28 02:35:59 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
32ef9695a7
Merge pull request #9282 from frederic34/patch-19 
Update card.php
 2018-08-28 02:28:35 +02:00
Laurent Destailleur
7462a1ae1d
Update card.php 2018-08-28 02:27:56 +02:00
Laurent Destailleur
2306f8a7c2
Merge pull request #9265 from grandoc/new_branch_18_08_2018 
Typo
 2018-08-28 02:25:24 +02:00
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-08-28 02:23:34 +02:00