lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,582 Commits 43 Branches 150 Tags 886 MiB
6161d8300c
Commit Graph

70582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6161d8300c
Merge pull request #9850 from simnandez/develop 
New: works with variants:
 2018-10-24 01:47:39 +02:00
Laurent Destailleur
914e4f0501
Merge pull request #9855 from atm-john/Fix_printer 
FIX/ADD missing print button for delivery form
 2018-10-24 01:46:20 +02:00
Laurent Destailleur
c6cfb977bb
Merge pull request #9852 from atm-john/fix_develop_travis 
Fix travis messages
 2018-10-24 01:45:12 +02:00
Laurent Destailleur
54b0fa1057
Merge pull request #9846 from bafbes/abb80037 
Fix:empty value instead of 0 for empty links
 2018-10-24 01:43:37 +02:00
Laurent Destailleur
592bfafd51
Merge pull request #9829 from frederic34/patch-16 
code comment
 2018-10-24 01:42:41 +02:00
Laurent Destailleur
652bef3e61
Merge pull request #9830 from frederic34/patch-17 
change class name from lettering to Lettering
 2018-10-24 01:42:22 +02:00
Laurent Destailleur
fe665a060d
Merge branch 'develop' into patch-17 2018-10-24 01:42:02 +02:00
Laurent Destailleur
23a9416c19 Fix deprecated field 2018-10-23 23:51:27 +02:00
atm-john
0fe2c63bc0 FIX missing print button for delivery form 2018-10-23 22:11:39 +02:00
Laurent Destailleur
0ad991766c Fix deletion of project when there is events 2018-10-23 17:53:01 +02:00
John BOTELLA
d9965d1986 Fix travis messages 2018-10-23 17:18:30 +02:00
Juanjo Menent
bdf94a4802 Merge remote-tracking branch 'upstream/develop' into develop 2018-10-23 13:08:18 +02:00
Juanjo Menent
e40ee879dc New: works with variants: 
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
 2018-10-23 13:07:09 +02:00
Laurent Destailleur
e0b20c2632 Add holiday for India 2018-10-23 12:49:48 +02:00
Abbes Bahfir
5bac6a92e6 Fix:empty value instead of 0 for empty links 2018-10-23 00:03:34 +01:00
Laurent Destailleur
f65df9e541 NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF 2018-10-22 20:06:03 +02:00
Laurent Destailleur
2816bdf747 FIX Date into filename of FEC file. 2018-10-21 16:22:56 +02:00
Laurent Destailleur
4e6b21881f Fix bug reported by scrutinizer 2018-10-21 12:14:20 +02:00
Laurent Destailleur
868caa4991 Missing ref_customer in popup 2018-10-21 12:05:31 +02:00
Laurent Destailleur
f6b3bc3bdb Fix thirdparty popup 2018-10-21 12:03:22 +02:00
Laurent Destailleur
fa99ea1f0f Fix thirdparty popup 2018-10-21 11:55:25 +02:00
Laurent Destailleur
cd9431809b Fix: do not loose country_code after update 2018-10-21 11:44:21 +02:00
Laurent Destailleur
d38c68e54f Remove unexpected char 2018-10-21 11:10:04 +02:00
Frédéric FRANCE
02954931d8
Update thirdparty_lettrage_supplier.php 2018-10-20 16:27:15 +02:00
Frédéric FRANCE
d3022413ef
Update thirdparty_lettrage.php 2018-10-20 16:25:57 +02:00
Frédéric FRANCE
fab10acc15
change class name from lettering to Lettering 2018-10-20 16:23:43 +02:00
Frédéric FRANCE
4d72cafa52
code comment 2018-10-20 13:47:51 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files 
Experimental new pdf documents  using new column system
 2018-10-19 15:51:54 +02:00
Laurent Destailleur
4571210bcf Fix remove deprecated field 2018-10-19 15:45:56 +02:00
Laurent Destailleur
897a2b09a7 Removed scrutinizer warning 2018-10-19 15:02:54 +02:00
Laurent Destailleur
b32ffdbbb9 Clean code 2018-10-19 14:59:00 +02:00
Laurent Destailleur
0408d123ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:46:39 +02:00
Laurent Destailleur
e4b5cc154e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:46:32 +02:00
Laurent Destailleur
33cd0e84d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5 Fix regression in creating discount 2018-10-19 14:43:10 +02:00
Laurent Destailleur
5a228bf394
Merge pull request #9786 from aspangaro/9.0_accountancy2 
Fix FEC on accountancy movement card
 2018-10-19 14:33:46 +02:00
Laurent Destailleur
4e82a6da46 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:32 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
91745491ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-19 14:27:37 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
47abbd3eb2 Fix bad merge 2018-10-19 14:23:36 +02:00
Laurent Destailleur
13171b0b55
Merge pull request #9781 from frederic34/patch-17 
do not trim int
 2018-10-19 14:18:32 +02:00
Laurent Destailleur
36ae81c749 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php
 2018-10-19 14:16:53 +02:00
Laurent Destailleur
6fde6e4250
Merge pull request #9787 from fmarcet/6.0 
FIX: When delete a product, llx_product_association rows are not deleted
 2018-10-19 14:06:50 +02:00
Laurent Destailleur
6d1a934e8d
Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type 
NEW Add configuration to disable "customer/prospect" thirdparty type
 2018-10-19 13:47:33 +02:00
Laurent Destailleur
c1d2556965
Update admin.lang 2018-10-19 13:47:18 +02:00
Laurent Destailleur
b6cb16a457
Merge pull request #9783 from frederic34/patch-18 
Update menubase.class.php
 2018-10-19 13:44:11 +02:00
Laurent Destailleur
86216960d4
Merge pull request #9785 from ptibogxiv/patch-81 
NEW ADD civility list in API
 2018-10-19 13:41:20 +02:00
Laurent Destailleur
078654b114
Merge pull request #9782 from ptibogxiv/patch-79 
FIX uniformization dates of order in API
 2018-10-19 13:39:10 +02:00