Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,865 Commits 36 Branches 190 Tags
c3438b79c8e2ab4dc49b9cc96873c9ff5b51f92c
Commit Graph

68865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
cac596037f Update card.php 2018-07-25 09:50:04 +02:00
Frédéric FRANCE
b87c3b80af code cleaning 2018-07-25 09:36:34 +02:00
Laurent Destailleur
cfb0f2df05 Merge pull request #9149 from OPEN-DSI/fix_propal_list 
FIX search on ref project on propal list
 2018-07-24 21:42:02 +02:00
Laurent Destailleur
0c0c9269d5 Merge pull request #9148 from hregis/develop_api 
FIX clean code
 2018-07-24 21:41:41 +02:00
Laurent Destailleur
e024ea9c05 Merge pull request #9146 from grandoc/new_branch_24_07_2018 
Clean and update code
 2018-07-24 21:41:12 +02:00
Philippe
d7f58d0087 FIX search on ref project on propal list 2018-07-24 20:28:49 +02:00
Regis Houssin
ff733c5ad7 FIX clean code 2018-07-24 20:10:27 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
7821e21e5b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:51 +02:00
Laurent Destailleur
d871b8964f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:40 +02:00
Laurent Destailleur
927727edf3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-24 19:22:12 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
 2018-07-24 19:22:00 +02:00
Laurent Destailleur
f672e8bf02 Fix trans 2018-07-24 19:12:35 +02:00
Regis Houssin
b7dfc99882 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price 2018-07-24 18:58:23 +02:00
Philippe GRAND
2a6f050e32 Clean and update code 2018-07-24 18:28:56 +02:00
Laurent Destailleur
f50aa03187 Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish 
FIX: stock replenish with multientity
 2018-07-24 18:10:00 +02:00
Laurent Destailleur
e9eb8da61b Update replenish.php 2018-07-24 18:09:50 +02:00
Laurent Destailleur
77c121b15c Merge pull request #9099 from ATM-Nicolas/7.0 
NEW Set contactCivName substitution key
 2018-07-24 18:02:21 +02:00
Laurent Destailleur
ece655a84a Merge pull request #9128 from atm-john/fix_situation_invoice_status 
Fix situation invoice status
 2018-07-24 17:49:53 +02:00
Laurent Destailleur
869a97c8d1 Update card.php 2018-07-24 17:49:10 +02:00
Laurent Destailleur
a469f841f7 Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf 
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
 2018-07-24 17:47:37 +02:00
Laurent Destailleur
bb9c53b41f Merge pull request #9118 from bugness-chl/8.0 
corr. "group by" for PostgreSQL
 2018-07-24 17:43:36 +02:00
Laurent Destailleur
08a5b499fe Merge pull request #9139 from bugness-chl/8.0-translation 
Translation: adding 'Enable' term in main
 2018-07-24 17:41:53 +02:00
Laurent Destailleur
b992c4b260 Merge pull request #9117 from frederic34/patch-11 
remove commented log
 2018-07-24 17:37:46 +02:00
Laurent Destailleur
9d1b7e25f7 Merge pull request #9127 from IAS-SYSTEMS-CSC/develop 
Fix if time spent minutes was zero
 2018-07-24 17:35:33 +02:00
Laurent Destailleur
dc34794ef1 Merge pull request #9120 from grandoc/new_branch_18_07_2018 
clean and update code
 2018-07-24 17:33:22 +02:00
Laurent Destailleur
c7f54439ff Merge pull request #9145 from frederic34/patch-12 
use defaut currency for supplier order
 2018-07-24 17:32:11 +02:00
Laurent Destailleur
71deb9ea60 Merge pull request #9143 from hregis/8.0_dict 
FIX field is autoincrement but not "rowid"
 2018-07-24 17:22:53 +02:00
Laurent Destailleur
68ad5d780c Merge pull request #9142 from hregis/8.0_pg 
FIX missing drop old postgresql unique key
 2018-07-24 17:16:55 +02:00
Laurent Destailleur
438cdfc004 FIX #9141 2018-07-24 17:16:21 +02:00
Regis Houssin
835cb04631 FIX remove rowid for multicompany compatibility 2018-07-24 17:07:08 +02:00
Laurent Destailleur
2b7735ec71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 17:06:55 +02:00
Laurent Destailleur
7e9a2c5ec7 Fix #9092 2018-07-24 17:06:41 +02:00
Frédéric FRANCE
bde30b85ad use defaut currency for supplier order 2018-07-24 17:06:12 +02:00
Laurent Destailleur
c1002e7b41 Merge pull request #9123 from atm-maxime/new_timespent_numeric 
NEW Allow to enter a timespent with a numeric value
 2018-07-24 16:58:24 +02:00
Laurent Destailleur
42e8bcb832 Merge pull request #9122 from grandoc/new_branch_19_07_2018 
Clean and update code
 2018-07-24 16:56:38 +02:00
Laurent Destailleur
3bdf7d411d Merge pull request #9125 from atm-john/fix_php7_warning_mysql 
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
 2018-07-24 16:56:10 +02:00
Laurent Destailleur
a65c4ebecd Merge pull request #9130 from hregis/8.0_bug 
FIX disable/enable foreign key checking for avoid errors
 2018-07-24 16:55:37 +02:00
Laurent Destailleur
8866b8eb1d Merge pull request #9133 from frederic34/patch-12 
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
 2018-07-24 16:54:04 +02:00
Laurent Destailleur
3e54ee5df7 Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop 
Fix chromephp firephp Syslog infinite loop
 2018-07-24 16:53:32 +02:00
Laurent Destailleur
e4705669ba Merge pull request #9136 from frederic34/patch-17 
remove % in supplier order pdf
 2018-07-24 16:51:58 +02:00
Laurent Destailleur
aa5319fc4d Merge pull request #9137 from grandoc/new_branch_23_07_2018 
clean and update code
 2018-07-24 16:51:25 +02:00
Regis Houssin
d4920521b5 FIX multicompany compatibility ! 2018-07-24 15:44:21 +02:00
Regis Houssin
20a1ffe810 FIX field is autoincrement but not "rowid" 2018-07-24 12:15:54 +02:00
Regis Houssin
25c93de801 FIX missing drop old postgresql unique key 2018-07-24 11:23:44 +02:00
Laurent Destailleur
ccd7332647 Fix default value of joinfile when creating a new email template 2018-07-24 01:46:14 +02:00
Laurent Destailleur
a1bdc6022d Website module 2018-07-24 01:10:38 +02:00
Chl
0f115dafee 2 bugfix for PDF generated by Templates/Cron: DueDate and translation 
When launching Cron on a facturerec with auto_validate at 1, the
generated PDF doesn't contain the DueDate, and some tokens like
__INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not
translated (tested with fr_FR).
 2018-07-24 00:39:21 +02:00
Chl
4995a0feb1 Translation: adding 'Enable' term in main 
compta/facture/fiche-rec.php uses 'Enable' / 'Disable' in a button text
but no translation is available for 'Enable'.

Another option would be to change 'Enable' to 'Activate' in
fiche-rec.php but I guess this word will probably be useful in other
places.
 2018-07-24 00:38:48 +02:00
Philippe GRAND
442ffb95ba clean and update code 2018-07-23 17:57:11 +02:00