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

76665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c0aabaa3cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 04:11:08 +02:00
Laurent Destailleur
d15a300f02 Removed not used var 2019-06-20 04:10:58 +02:00
Laurent Destailleur
06e5fbd649
Merge pull request #11132 from ptibogxiv/patch-174 
NEW add API shipment mode dictionnary
 2019-06-20 03:56:59 +02:00
Laurent Destailleur
77a45b878b Fix migration 2019-06-20 03:56:42 +02:00
Laurent Destailleur
40023c8ba2
Merge branch 'develop' into patch-174 2019-06-20 03:56:29 +02:00
Laurent Destailleur
5fe91afdc2
Update 9.0.0-10.0.0.sql 2019-06-20 03:54:50 +02:00
Laurent Destailleur
5d4d02f3b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:54:20 +02:00
Laurent Destailleur
5f32b5e23e Prepare v11 alpha 2019-06-20 03:54:11 +02:00
Laurent Destailleur
d8c2007d92 Prepare v11 alpha 2019-06-20 03:53:33 +02:00
Laurent Destailleur
e64a4510d1
Merge pull request #11211 from atm-john/New_look_and_feel_form_validation 
NEW: look and feel -> css for html5 ::invalid pseudo element
 2019-06-20 03:48:56 +02:00
Laurent Destailleur
4a101a8e9f
Merge pull request #11161 from hregis/develop_bug 
NEW add "printBucktrackInfo" hook, an external module can add info
 2019-06-20 03:48:24 +02:00
Laurent Destailleur
0639313503
Merge branch 'develop' into develop_bug 2019-06-20 03:47:45 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
001da8b2fc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:44:54 +02:00
Laurent Destailleur
ee8e7d66f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 03:43:27 +02:00
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-06-20 03:43:16 +02:00
Laurent Destailleur
26c12c61a7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-20 03:39:56 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other 
Translate rights
 2019-06-20 03:36:16 +02:00
Laurent Destailleur
980239e617
Merge pull request #11362 from aspangaro/10.0_index 
Responsive on project index
 2019-06-20 03:35:13 +02:00
Laurent Destailleur
2c0d43a27a
Merge pull request #11372 from bafbes/abb90059 
New:Show c_country elements in modulebuilder
 2019-06-20 03:32:53 +02:00
Laurent Destailleur
2b0b7b0dab
Update ccountry.class.php 2019-06-20 03:32:28 +02:00
Laurent Destailleur
e99cf13ccf
Merge pull request #11225 from ATM-Nicolas/new_propal_list_column 
NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
 2019-06-20 03:27:45 +02:00
Laurent Destailleur
3faa0012a1
Merge pull request #11358 from hregis/10.0 
FIX add v10 in virtualmin script
 2019-06-20 03:24:48 +02:00
Laurent Destailleur
13200a4d51
Merge pull request #11350 from frederic34/patch-7 
NEW can specify hour start end for selectDate and step for minutes
 2019-06-20 03:24:23 +02:00
Laurent Destailleur
03178bc481
Merge pull request #11293 from hregis/develop_pdf 
FIX better method to check if pdf is protected/encrypted
 2019-06-20 03:22:51 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield 
NEW add extrafields in warehouses
 2019-06-20 03:16:49 +02:00
Laurent Destailleur
382ec1a106
Merge pull request #11254 from andreubisquerra/master 
Basic phone layout for Restaurants in TakePOS
 2019-06-20 03:14:23 +02:00
Laurent Destailleur
47430d358d
Merge pull request #11356 from ptibogxiv/patch-191 
NEW list of measuring units API
 2019-06-20 03:13:28 +02:00
Laurent Destailleur
2372d32436
Merge pull request #11319 from atm-maxime/new_suppinvoice_list_massfilearea 
New : add file area at bottom of supplier invoices list
 2019-06-20 03:12:45 +02:00
Laurent Destailleur
53688e2d0f
Merge pull request #11353 from fmarcet/8.0 
FIX: Wrong stock movement on supplier credit notes
 2019-06-20 03:11:28 +02:00
Laurent Destailleur
ca4b8f9540
Merge pull request #11355 from ptibogxiv/patch-190 
Fix access category API
 2019-06-20 03:10:11 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber 
Allow zero as account number
 2019-06-20 03:09:37 +02:00
Laurent Destailleur
d840c8f831
Merge pull request #11348 from frederic34/patch-5 
Update companies.lang
 2019-06-20 03:05:43 +02:00
Laurent Destailleur
23b0263ad9
Merge pull request #11357 from frederic34/patch-8 
avoid countable error
 2019-06-20 03:05:23 +02:00
Laurent Destailleur
9a61175af3
Merge pull request #11360 from inoveaconseil/MissingHook 
NEW Add hooks on index pages
 2019-06-20 03:04:42 +02:00
Laurent Destailleur
4308f48cad
Merge branch 'develop' into MissingHook 2019-06-20 03:04:32 +02:00
Laurent Destailleur
daab58974e
Merge pull request #11366 from aspangaro/10.0_other2 
Missing language key
 2019-06-20 03:02:13 +02:00
Laurent Destailleur
3c50786225
Merge pull request #11377 from aspangaro/11.0_product_list_vat_rate 
NEW Add column VAT rate in product list
 2019-06-20 03:01:50 +02:00
Laurent Destailleur
b4cb440b0f
Merge pull request #11359 from inoveaconseil/FIX_BOM_sql 
Fix bom sql
 2019-06-20 02:58:24 +02:00
Laurent Destailleur
4c7a689fb5
Merge pull request #11373 from atm-john/8.0_fix_var_name 
FIX var name
 2019-06-20 02:57:39 +02:00
Laurent Destailleur
a70dfa17a4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 02:56:53 +02:00
Laurent Destailleur
6d38f5ec9c FIX #11369 2019-06-20 02:56:44 +02:00
Laurent Destailleur
925314c710
Merge pull request #11367 from aspangaro/10.0_other3 
Nowrap on amount
 2019-06-20 02:51:14 +02:00
Laurent Destailleur
e060af5c97
Update treso.php 2019-06-20 02:50:23 +02:00
Laurent Destailleur
33f39bdfcb
Merge pull request #11368 from atm-gauthier/8.0_fix_facfourn_fetch_in_right_entity 
FIX : we need to fetch fourn invoice with ref in current entity
 2019-06-20 02:48:42 +02:00
Laurent Destailleur
b4e47d289b Code comment 2019-06-20 02:43:56 +02:00
Laurent Destailleur
14cce1f8b0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-19 22:28:53 +02:00
Laurent Destailleur
bf71731fc9 Fix phpcs 2019-06-19 22:28:33 +02:00
Laurent Destailleur
d6b6f77e74 Fix support domains with 3 levels 2019-06-19 22:06:12 +02:00