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

68103 Commits

Author SHA1 Message Date
Laurent Destailleur
becd3f7d2f FIX Missing status and paid flag in export or expense report 2019-10-18 15:35:25 +02:00
Laurent Destailleur
d9abbfa461 Add a message 2019-10-17 21:12:18 +02:00
Laurent Destailleur
25fe861f9b
Merge pull request #12151 from tuxgasy/10_Product_import_duplicate_volumUnits 
Fix width unit label in product import
 2019-10-17 17:47:31 +02:00
Gildas
ac46d2c918 Fix filtering ticket bug (Fixes #12081) 2019-10-17 17:46:42 +02:00
Laurent Destailleur
5e12dcc6b1 Fix on FACTURE_ENABLE_NEGATIVE 2019-10-17 15:40:02 +02:00
Laurent Destailleur
1a419a6eb6 Fix translation 2019-10-17 15:15:16 +02:00
Laurent Destailleur
e709c005a0 FIX Payment was not saved on TakePOS module. 2019-10-17 12:28:48 +02:00
Laurent Destailleur
084ab53b4b Fix translation 2019-10-17 12:14:38 +02:00
Laurent Destailleur
8a7a0b80e2 Fix remove warnings 2019-10-16 19:08:31 +02:00
TuxGasy
43ce1543d8 Fix width unit label in product import 2019-10-16 17:37:20 +02:00
Laurent Destailleur
8152c60878 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-10-16 17:13:14 +02:00
Laurent Destailleur
93aa7e208d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:19 +02:00
Laurent Destailleur
b47ebcca2b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:10 +02:00
Laurent Destailleur
86e4ca55df Merge 2019-10-16 14:04:54 +02:00
Laurent Destailleur
81cb88721a
Merge pull request #12146 from aspangaro/10.0_p27 
Fix - Accountancy - Various payment - Subledger is not recovered in bank journal
 2019-10-16 13:19:46 +02:00
Juanjo Menent
5a1682509b FIX It is not possible to create an expedition if there is no unit data 2019-10-16 11:11:34 +02:00
Alexandre SPANGARO
4bb1677079 Fix - Accountancy - Various payment - Subledger is not recovered in bank journal 2019-10-16 10:39:35 +02:00
Frédéric FRANCE
6a8e8907ef
Update list.php 2019-10-15 17:55:07 +02:00
Laurent Destailleur
568faef7f4 Fix encoding of message 2019-10-15 04:08:34 +02:00
Laurent Destailleur
ee5fdc3239 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 23:52:58 +02:00
Laurent Destailleur
0fe3159a8a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2019-10-14 23:52:46 +02:00
Laurent Destailleur
6662b00575 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:40 +02:00
Laurent Destailleur
2d1bc90e57 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:06 +02:00
Laurent Destailleur
9f61bd23ce
Merge pull request #12127 from atm-josselin/FIX_product_batch_fields_definition 
Fix : add fields definition in product batch class
 2019-10-14 21:22:24 +02:00
Laurent Destailleur
07bb83a96d
Merge pull request #12113 from aspangaro/10.0_p25 
Remove a duplicate line
 2019-10-14 21:04:22 +02:00
Laurent Destailleur
d87a1e39a6
Merge pull request #12110 from aspangaro/10.0_holiday 
lang file for holidays is holiday
 2019-10-14 21:03:55 +02:00
Laurent Destailleur
3432147385
Merge pull request #12099 from prietojc/patch-11 
FIX: Update card.php
 2019-10-14 21:02:04 +02:00
Laurent Destailleur
2e7cc67f9c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 20:42:28 +02:00
Laurent Destailleur
056f7f826b Clean code 2019-10-14 20:41:28 +02:00
Laurent Destailleur
ed0e090d91
Merge pull request #12123 from atm-greg/FIX_blocked_log_missing_lib 
add security.lib.php for dol_hash
 2019-10-14 20:37:19 +02:00
Frédéric FRANCE
45b3d623bb
Update list.php 2019-10-14 20:30:31 +02:00
atm-josselin
4f10009113 Add fields definition in product batch class for extrafields compatibility 2019-10-14 15:39:38 +02:00
atm-greg
92c624daf0 add security.lib.php for dol_hash 2019-10-14 15:28:06 +02:00
Laurent Destailleur
4fd12e22cb Fix trans export 2019-10-14 12:27:44 +02:00
Alexandre SPANGARO
e50d32dc00 Remove a duplicate line 2019-10-13 13:20:45 +02:00
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Laurent Destailleur
650cd2b54f Prepare 10.0.3 2019-10-12 18:41:33 +02:00
Laurent Destailleur
9c94ffeea9 Fix css 2019-10-12 18:40:41 +02:00
Laurent Destailleur
67d76787eb Add new hidden conf VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT 2019-10-12 15:29:06 +02:00
Laurent Destailleur
9871dd8770 Debug variants 2019-10-12 15:27:06 +02:00
Frédéric FRANCE
c3e8aec07c
fix translation for showemailing 
in lang files, it's ShowEMailing not ShowEmailing
 2019-10-11 23:54:05 +02:00
Laurent Destailleur
2fa3b23cf1 Fix missing price level field 2019-10-11 19:36:36 +02:00
Laurent Destailleur
f345b5fdb0 Fix look and feel v10 2019-10-11 19:32:45 +02:00
JC Prieto
d109341ebe
Update card.php 
Variable $mesg not do anything
 2019-10-11 18:08:15 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:12:01 +02:00
Laurent Destailleur
7ea0af4067 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:38 +02:00
Laurent Destailleur
2a07ecf659 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:30 +02:00
Laurent Destailleur
777c297353 FIX #12054 2019-10-11 15:42:27 +02:00
Laurent Destailleur
85a4bac9e0 Better translation 2019-10-11 15:22:12 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00