Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
90,904 Commits 35 Branches 179 Tags 1.7 GiB
f4e63bb046
Commit Graph

90904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc de Lima Lucio
f4e63bb046 NEW: ref in product customer price: add fields in database 2020-10-26 10:52:22 +01:00
Laurent Destailleur
858c48bd15 Fix 2020-10-25 22:12:16 +01:00
Laurent Destailleur
2026705045 Start beta 2020-10-25 21:47:50 +01:00
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2020-10-25 21:33:13 +01:00
Laurent Destailleur
ec0da6921a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-25 21:10:00 +01:00
Laurent Destailleur
6bc0630c5f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
 2020-10-25 21:09:43 +01:00
Laurent Destailleur
baa86d773b Fix phpcs 2020-10-25 21:07:37 +01:00
Laurent Destailleur
6c1f60f6c0 Fix regression 2020-10-25 17:19:15 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
70082d17b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-25 15:22:35 +01:00
Laurent Destailleur
859fea626d Use more generic domain 2020-10-25 15:22:23 +01:00
Laurent Destailleur
f7e1071e8e
Merge pull request #15073 from SwikritiT/develop 
[Tests-only] Added API tests for list users feature
 2020-10-25 15:19:01 +01:00
Laurent Destailleur
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account 
11878 - select the only bank account
 2020-10-25 14:56:08 +01:00
Laurent Destailleur
dbf626b92b
Update html.form.class.php 2020-10-25 14:55:52 +01:00
Laurent Destailleur
36854b0af4
Merge pull request #15123 from frederic34/patch-8 
fix unknown function
 2020-10-25 14:51:42 +01:00
Laurent Destailleur
80bbec7aeb
Merge pull request #15122 from frederic34/publicmember 
add hook on public new member card
 2020-10-25 14:51:14 +01:00
Laurent Destailleur
e7743948cb
Merge pull request #15120 from frederic34/patch-6 
Update commonobject.class.php
 2020-10-25 14:50:56 +01:00
Laurent Destailleur
b80d135fcb
Merge pull request #15119 from FHenry/12.0_fix_mailerrormessage 
fix mail error message
 2020-10-25 14:50:23 +01:00
Laurent Destailleur
7a85f5a9ab
Merge pull request #15118 from hregis/develop_bug2 
FIX avoid warning
 2020-10-25 14:49:06 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
f1cab5aa23
Merge pull request #15125 from frederic34/statcard 
replace & by &&
 2020-10-25 14:47:07 +01:00
Laurent Destailleur
a2f785e8aa
Merge pull request #15126 from frederic34/patch-10 
doxygen
 2020-10-25 14:46:01 +01:00
Laurent Destailleur
cc17f08409
Merge pull request #15131 from frederic34/patch-13 
doxygen
 2020-10-25 14:45:24 +01:00
Laurent Destailleur
21d26c008a
Merge pull request #15130 from bafbes/abb120351 
fix:rowid is string in currencies table
 2020-10-25 14:45:12 +01:00
Laurent Destailleur
335d1db3a6
Update dict.php 2020-10-25 14:43:33 +01:00
Laurent Destailleur
f31b4ee49d
Merge pull request #15127 from frederic34/task_universal 
fix unknown property db
 2020-10-25 14:35:03 +01:00
Laurent Destailleur
c6cee2f96f
Merge pull request #15128 from frederic34/patch-11 
doxygen
 2020-10-25 14:34:15 +01:00
Laurent Destailleur
180d01e76e
Merge pull request #15132 from frederic34/patch-14 
doxygen
 2020-10-25 14:34:04 +01:00
Laurent Destailleur
167430137f
Merge pull request #15134 from frederic34/public_ticket 
add hook on public new ticket
 2020-10-25 14:33:46 +01:00
Laurent Destailleur
9ccafcb651
Merge pull request #15133 from ptibogxiv/patch-390 
Fix takeposlist thirdparty
 2020-10-25 14:33:08 +01:00
Laurent Destailleur
bb6a71c534
Merge pull request #15135 from frederic34/loanlib 
fix variable
 2020-10-25 14:15:18 +01:00
Laurent Destailleur
495d8e711a
Merge pull request #15137 from frederic34/patch-16 
Update chargesociales.class.php
 2020-10-25 14:15:06 +01:00
Laurent Destailleur
a7b23dc4f6
Update chargesociales.class.php 2020-10-25 14:14:50 +01:00
Laurent Destailleur
dfc8606114
Merge pull request #15136 from frederic34/patch-15 
doxygen
 2020-10-25 14:13:54 +01:00
Laurent Destailleur
13beeb0a61
Merge pull request #15138 from frederic34/patch-17 
Update asset.class.php
 2020-10-25 14:13:28 +01:00
Laurent Destailleur
182de28d74 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-25 14:12:51 +01:00
Laurent Destailleur
bb147d2599 FIX #15140 2020-10-25 14:12:34 +01:00
Laurent Destailleur
02ef5ad3b9
Merge pull request #15144 from atm-maxime/fix_supp_inv_numbering 
Fix #15064 : error when supplier invoice numbering module is not configured
 2020-10-25 13:58:48 +01:00
Laurent Destailleur
b6db71e5e6
Merge pull request #15146 from atm-maxime/fix_selected_lines_invoice_creation 
Fix #15143 selected lines on invoice creation
 2020-10-25 13:57:00 +01:00
Laurent Destailleur
b02c734c69
Merge pull request #15141 from atm-maxime/fix_bom_rang 
Fix BOM position field
 2020-10-25 13:54:45 +01:00
Laurent Destailleur
d21f51a35e
Merge pull request #15142 from atm-maxime/fix_contract_box_var 
Fix var name in contract box
 2020-10-25 13:54:04 +01:00
Laurent Destailleur
42a8f75245
Merge pull request #15145 from frederic34/2020_zappier 
add zapier readme
 2020-10-25 13:53:46 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
729a6aa364
hook list 2020-10-25 12:17:43 +01:00
Maxime Kohlhaas
309691f1e7 Fix #15143 selected lines on invoice creation 2020-10-25 09:28:41 +01:00
Frédéric FRANCE
8d08157018
add zapier readme 2020-10-25 09:26:48 +01:00
Frédéric FRANCE
ec033ff101
add zapier readme 2020-10-25 09:22:51 +01:00
Maxime Kohlhaas
680ae60b6f Fix #15064 : error when supplier invoice numbering module is not configured 2020-10-25 08:56:34 +01:00
Maxime Kohlhaas
7080c8491d Fix var name in contract box 2020-10-24 19:46:57 +02:00