Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

82240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
95fc14475c Fix show correct stripe publishable_key on payment mode page 2019-12-15 17:32:45 +01:00
Laurent Destailleur
cb71d5a7bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-15 17:18:21 +01:00
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
Laurent Destailleur
70fcb68a7d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-15 15:03:42 +01:00
Laurent Destailleur
9685b56375 Fix warning 2019-12-15 15:03:22 +01:00
Frédéric FRANCE
e1386faa59 doxygen 2019-12-15 10:53:03 +01:00
Frédéric FRANCE
9e4fb8d4fe doxygen 2019-12-15 10:02:20 +01:00
Laurent Destailleur
a796106c26 Merge pull request #12711 from frederic34/patch-7 
doxygen
 2019-12-14 22:28:29 +01:00
Laurent Destailleur
60a0c18338 Merge pull request #12708 from atm-gauthier/10.0_fix_product_fourn_price_id 
FIX : product_fourn_price_id was assigned too late for logPrice() function
 2019-12-14 22:28:11 +01:00
Laurent Destailleur
2c4fd099c8 Update fournisseur.product.class.php 2019-12-14 22:27:45 +01:00
Laurent Destailleur
e9a0646f6f Update fournisseur.product.class.php 2019-12-14 22:25:34 +01:00
Laurent Destailleur
6509a68a13 Merge pull request #12710 from frederic34/patch-6 
doxygen
 2019-12-14 22:20:32 +01:00
Frédéric FRANCE
bd270cd535 Update dolresource.class.php 2019-12-14 16:21:18 +01:00
Frédéric FRANCE
a6f0a7f499 Update note.php 2019-12-14 16:19:59 +01:00
Frédéric FRANCE
7eee26cc0f Update project.php 2019-12-14 16:18:41 +01:00
Frédéric FRANCE
8c7f0e669b Update mod_chequereceipt_mint.php 2019-12-14 16:13:48 +01:00
Frédéric FRANCE
440b846e9a Update mod_chequereceipt_mint.php 2019-12-14 16:12:38 +01:00
Frédéric FRANCE
ddc827e48e Update mod_chequereceipt_thyme.php 2019-12-14 16:11:27 +01:00
Frédéric FRANCE
f15d65c2b9 doxygen 2019-12-14 16:09:48 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
5e3698b023 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-12-14 14:44:38 +01:00
Laurent Destailleur
17b9964678 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2019-12-14 14:43:14 +01:00
Laurent Destailleur
31a60ff30b Fix $db 2019-12-14 14:41:27 +01:00
Laurent Destailleur
d1daf94b81 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-14 14:34:14 +01:00
Laurent Destailleur
a8de7b850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/admin/system/filecheck.php
 2019-12-14 14:33:46 +01:00
Laurent Destailleur
8b57e9fcf0 Merge pull request #12697 from bb2a/patch-7 
Full name in uppercase on creation and modification
 2019-12-14 14:00:09 +01:00
Laurent Destailleur
371a2c62bd Merge pull request #12695 from hregis/10.0_mc 
FIX #12688
 2019-12-14 13:58:43 +01:00
Laurent Destailleur
a0d9a7a970 Merge pull request #12704 from frederic34/patch-20 
The property db does not exist on mod_arctic
 2019-12-14 13:55:08 +01:00
Laurent Destailleur
dcc9f7d8d3 Merge pull request #12696 from atm-gauthier/10.0_fix_updateline_fourn_order_return_mustnot_be_zero 
FIX : CommandeFournisseurLigne update function must not be able to re…
 2019-12-14 13:54:51 +01:00
Laurent Destailleur
d17c177251 Merge pull request #12684 from frederic34/hookagendaperuser 
add hook like for per day/week/month
 2019-12-14 13:52:51 +01:00
Laurent Destailleur
4dc36ffd75 Merge pull request #12698 from frederic34/patch-11 
The variable $conf seems to be never defined
 2019-12-14 13:47:09 +01:00
Laurent Destailleur
95bd95cbef Merge pull request #12692 from frederic34/doxygen_todo 
doxygen todo
 2019-12-14 13:46:47 +01:00
Laurent Destailleur
835d22f556 Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
4562d00ac5 Merge pull request #12707 from frederic34/patch-23 
$type and $module are not defined
 2019-12-14 13:44:48 +01:00
Laurent Destailleur
cc52fcb294 Merge pull request #12699 from frederic34/patch-13 
The variable $query seems to be never defined
 2019-12-14 13:44:03 +01:00
Laurent Destailleur
8fbaae3fef Merge pull request #12694 from frederic34/patch-8 
doxygen
 2019-12-14 13:43:47 +01:00
Laurent Destailleur
1878a1de96 Merge pull request #12700 from frederic34/patch-14 
The variable xxx seems to be never defined
 2019-12-14 13:43:36 +01:00
Laurent Destailleur
7d6bdb6eee Merge pull request #12701 from frederic34/patch-15 
dol_fiche_head() returns void
 2019-12-14 13:43:13 +01:00
Laurent Destailleur
744e7fc5da Merge pull request #12703 from frederic34/patch-19 
doxygen
 2019-12-14 13:42:58 +01:00
Laurent Destailleur
dea5396029 Merge pull request #12705 from frederic34/patch-21 
doxygen
 2019-12-14 13:42:46 +01:00
Laurent Destailleur
a87372e9cd Merge pull request #12702 from frederic34/patch-17 
The variable $conf seems to be never defined
 2019-12-14 13:42:34 +01:00
Laurent Destailleur
9a6869f000 Merge pull request #12693 from frederic34/patch-7 
typo
 2019-12-14 13:42:19 +01:00
Laurent Destailleur
edaff84f41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-14 13:41:44 +01:00
Laurent Destailleur
26f0a30cfa Fix syntax error 2019-12-14 13:41:33 +01:00
Laurent Destailleur
65bf2fa285 Merge pull request #12689 from code-chicken/develop 
Fix: calculation of virtual stock
 2019-12-14 13:40:02 +01:00
Laurent Destailleur
9f2a628c3b Remove bak file 2019-12-14 13:25:21 +01:00
Laurent Destailleur
3a4b4e1559 Merge pull request #12706 from frederic34/patch-22 
Update generate_filelist_xml.php
 2019-12-14 13:23:36 +01:00
Laurent Destailleur
06ff74af80 Merge pull request #12683 from frederic34/patch-6 
do not trim int
 2019-12-14 13:22:30 +01:00
Laurent Destailleur
7ad6520b45 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-13 17:16:34 +01:00
Laurent Destailleur
7d39554797 FIX Bad type of sql fields 2019-12-13 17:16:21 +01:00