Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
99,661 Commits 36 Branches 189 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

24418 Commits

Author SHA1 Message Date
Laurent Destailleur
f801bc65c8 Merge pull request #15173 from frederic34/patch-6 
Clean code interface_20_all_Logevents.class.php
 2020-10-27 01:25:16 +01:00
Alfredo Altamirano
214cd2c99b Update references of MO translation string 2020-10-26 15:44:26 -06:00
Frédéric FRANCE
4a0dd3b4bc add small photo in picto link 2020-10-26 22:05:40 +01:00
Frédéric FRANCE
0bdd6abca9 Update interface_99_modZapier_ZapierTriggers.class.php 2020-10-26 20:14:45 +01:00
Frédéric FRANCE
557a0caa91 Update interface_20_all_Logevents.class.php 2020-10-26 20:10:19 +01:00
Laurent Destailleur
2340cb654d Merge pull request #15149 from defrance/patch-160 
Display application Title if filled on login page
 2020-10-26 19:32:42 +01:00
Laurent Destailleur
680f4f9fee Update login.tpl.php 2020-10-26 19:32:21 +01:00
Laurent Destailleur
a8fccc67ba Merge pull request #15148 from frederic34/patch-6 
doxygen
 2020-10-26 19:28:11 +01:00
Laurent Destailleur
c1cd25fb6b Merge pull request #15151 from frederic34/patch-8 
selectTypeContact return void
 2020-10-26 19:27:52 +01:00
Laurent Destailleur
12289ceb9e Merge pull request #15159 from Ahuahuachi/10.0 
FIX #15111 Fix special characters output in PDF
 2020-10-26 19:20:53 +01:00
Laurent Destailleur
130591480a Merge pull request #15171 from frederic34/cleantriggers 
clean triggers
 2020-10-26 18:54:54 +01:00
Frédéric FRANCE
360ea91be5 clean triggers 2020-10-26 18:46:03 +01:00
Frédéric FRANCE
66fbddb892 clean triggers 2020-10-26 18:35:27 +01:00
Frédéric FRANCE
3e686e167c clean triggers 2020-10-26 18:31:45 +01:00
Laurent Destailleur
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
Florian HENRY
3295c4b68f Merge branch 'dev_new_add_desc_when_select_product' of github.com:FHenry/dolibarr into dev_new_add_desc_when_select_product 2020-10-26 16:40:42 +01:00
Florian HENRY
9aa3368627 syntax 2020-10-26 16:33:13 +01:00
stickler-ci
a53e907706 Fixing style errors. 2020-10-26 15:32:00 +00:00
Florian HENRY
76824c868b clean get price for fourn and labal for supplier coducment 2020-10-26 16:31:07 +01:00
quentin
fd1f5bbe01 FIX table making extrafield too small advtagertmailing 2020-10-26 15:03:32 +01:00
quentin
5694a19c6a FIX table making extrafield input too small advtargetmailing 2020-10-26 14:51:13 +01:00
stickler-ci
541dab5737 Fixing style errors. 2020-10-26 13:40:05 +00:00
Marc de Lima Lucio
bb850ad0d0 NEW: ref in product customer price: add ref in PDFs + hidden conf to choose refs to show 2020-10-26 13:05:07 +01:00
Florian HENRY
8c935661ee Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product 2020-10-26 10:29:35 +01:00
Alfredo Altamirano
1b82b6af4d FIX #15111 Fix special characters output in PDF 2020-10-25 22:17:02 -06: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
9dfc08d2bd Fix bad var name 2020-10-25 21:11:05 +01:00
Florian HENRY
7c2b5b614f NEW: preload product description on selection for customer propal/order/invoice 2020-10-25 19:13:09 +01:00
Frédéric FRANCE
f2d21d68d6 selectTypeContact return void 2020-10-25 18:23:00 +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
BENKE Charlene
3efcb0dfeb Display application Title if filled on login page 2020-10-25 16:19:16 +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
Frédéric FRANCE
1f4bd8476b doxygen 2020-10-25 15:42:15 +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
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
4d9c8e2225 Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
cc17f08409 Merge pull request #15131 from frederic34/patch-13 
doxygen
 2020-10-25 14:45:24 +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
bb6a71c534 Merge pull request #15135 from frederic34/loanlib 
fix variable
 2020-10-25 14:15:18 +01:00
Laurent Destailleur
bb147d2599 FIX #15140 2020-10-25 14:12:34 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Maxime Kohlhaas
7080c8491d Fix var name in contract box 2020-10-24 19:46:57 +02:00
Maxime Kohlhaas
bedfb7ac8d Fix BOM position field 2020-10-24 19:19:06 +02:00