lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,428 Commits 43 Branches 150 Tags 886 MiB
62dc6814a3
Commit Graph

49428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fmarcet
62dc6814a3 FIX #3726 Not showing images on product card 2015-10-29 10:14:54 +01:00
Laurent Destailleur
1eca2d33c0 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-27 22:24:29 +01:00
Laurent Destailleur
87c240252c FIX Can export a field into task time table with export project profile 2015-10-27 22:24:18 +01:00
Laurent Destailleur
5bdc4a83b1 Merge pull request #3804 from atm-alexis/3.8_FIX_action_dont_appear_before_an_update 
FIX action not appear before an update
 2015-10-26 22:57:11 +01:00
Alexis Algoud
fa3af485ef FIX action not appear before an update 
because of a lack of line in action ressource
 2015-10-26 18:33:22 +01:00
Laurent Destailleur
77a0359cfc Fix bad test 2015-10-25 20:17:43 +01:00
Laurent Destailleur
295eb533f8 FIX Bad picto for expense report 2015-10-25 20:16:40 +01:00
Laurent Destailleur
4e206fa80b Fix doxygen 2015-10-25 19:53:59 +01:00
Laurent Destailleur
48ed8d4408 FIX The thumb of user into top menu was using the image in full size. 
This make a large download at each page call. We must use the mini
thumbs.
 2015-10-25 19:42:00 +01:00
Laurent Destailleur
2cbfb69f9b Update template 2015-10-23 15:28:14 +02:00
Laurent Destailleur
a01a85c3f6 FIX tag object_total_vat_x need x to be a string with unknown decimal 
lenght. Now use for x the real vat real with no more decimal (x = 20 or
x = 8.5 or x = 5.99, ...)
 2015-10-23 15:13:02 +02:00
Laurent Destailleur
0440e313d2 Merge pull request #3787 from atm-maxime/3.8 
Fixes on invoice list and creation
 2015-10-22 17:58:04 +02:00
Maxime Kohlhaas
ef2337a338 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 
Conflicts:
	htdocs/compta/facture/list.php
 2015-10-22 14:41:58 +02:00
Laurent Destailleur
d55f138fb1 Merge pull request #3785 from frederic34/patch-19 
FIX Error message not returne into update fournisseur.commande.class.php
 2015-10-22 10:43:10 +02:00
Laurent Destailleur
43f003f6f9 Merge pull request #3783 from frederic34/patch-18 
Fix lost searchstatus on next page list
 2015-10-22 10:35:40 +02:00
Frédéric FRANCE
4689b0cc11 Update fournisseur.commande.class.php 2015-10-21 17:31:51 +02:00
Frédéric FRANCE
5237a2afc7 Fix lost searchstatus on next page list 2015-10-20 17:45:24 +02:00
Laurent Destailleur
7d382f7997 FIX Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES 
into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED
for better compatibility with old versions
 2015-10-19 18:17:19 +02:00
Maxime Kohlhaas
d79fb71987 FIX : search_status not used in mergefusiontool 2015-10-19 16:17:47 +02:00
Maxime Kohlhaas
572be23fc1 FIX : filters on supplier invoices list are not used, search_status instead 2015-10-19 15:57:23 +02:00
Maxime Kohlhaas
5fb6705b5c FIX : Search status not saved into list 2015-10-19 15:53:13 +02:00
Maxime Kohlhaas
9e9f32e3bf FIX : project was not retrieved on invoice creation form 2015-10-19 15:38:28 +02:00
Laurent Destailleur
6a90431cf1 Prepare 3.8.2 2015-10-19 14:04:47 +02:00
Laurent Destailleur
fd3ba13130 FIX #3541 Bypass authentication when user was created using LDAP 2015-10-18 21:33:47 +02:00
Laurent Destailleur
bf6b48f5a0 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-18 21:17:29 +02:00
Laurent Destailleur
afe4057a97 FIX #3757 Can't set amount in a social contribution with some languages 2015-10-18 21:17:19 +02:00
Laurent Destailleur
be8e7515a1 Merge pull request #3762 from simnandez/3.8 
Fix: Last page total is 0
 2015-10-18 20:27:17 +02:00
Laurent Destailleur
c64c1a0201 FIX If no end date is set on survey, we should be able to vote. 2015-10-18 20:11:26 +02:00
Laurent Destailleur
420bfd8301 FIX Preview pages was not using correct style for ref 2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39 FIX The preview of PDF was never refreshed if PDF document was changed 2015-10-18 18:54:54 +02:00
Juanjo Menent
334c14d088 Fix: Last page total is 0 2015-10-18 11:56:42 +02:00
Laurent Destailleur
0211ad64ee FIX Total in summary was not same than into detail on the referrer page. 
Conflicts:
	htdocs/product/stats/facture.php
 2015-10-17 12:36:51 +02:00
Laurent Destailleur
5c1daa6135 Merge pull request #3746 from atm-gauthier/3.8_fix_function_update_extra 
FIX : 1/ update_extra() function musn't be in  "if(!empty(MAIN_DISABL…
 2015-10-17 10:39:37 +02:00
Laurent Destailleur
fc8f4b4d6e Merge pull request #3745 from atm-arnaud/3.8_fix_propale_facturee 
FIX bug invoice classified in propale next update commonobject class …
 2015-10-17 10:38:35 +02:00
Laurent Destailleur
bba8db2b60 Merge pull request #3744 from atm-gauthier/3.8_fix_thirdparty_parent 
FIX : Societe::set_parent() function needs societe object to be fetch…
 2015-10-17 10:37:36 +02:00
Laurent Destailleur
686a923974 Merge pull request #3754 from frederic34/patch-16 
FIX Update status of fournisseur.commande.class.php
 2015-10-17 10:36:09 +02:00
Frédéric FRANCE
d68db2a844 Update fournisseur.commande.class.php 2015-10-17 08:48:53 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Gauthier
b3e3cc14a7 FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABLE_CONTACTS_TAB)" test. 
2/ Reindented code
 2015-10-15 17:26:16 +02:00
arnaud
6bd13b8071 FIX bug invoice classified in propale next update commonobject class in 3.8 2015-10-15 17:02:33 +02:00
Gauthier
2c6aeac64f FIX : Societe::set_parent() function needs societe object to be fetched to update parent 2015-10-15 16:48:52 +02:00
Laurent Destailleur
e79fe7401f Merge pull request #3741 from fmarcet/3.8 
FIX #3689 Bug on workflow module
 2015-10-15 13:09:43 +02:00
fmarcet
4cdf17d8b5 FIX #3689 Bug on workflow module 2015-10-15 12:17:57 +02:00
Laurent Destailleur
ff1f7f1a48 Merge pull request #3739 from GPCsolutions/3.8-3728 
Fix #3728 Properly remove last category
 2015-10-15 12:00:22 +02:00
Raphaël Doursenaud
6c2b46f939 Fix #3728 Properly remove last category 2015-10-15 10:15:37 +02:00
Laurent Destailleur
05686b532c Merge pull request #3733 from fappels/3.8-shipment-lot-delete 
FIX: #3605 deleting a shipping
 2015-10-14 21:41:20 +02:00
Laurent Destailleur
5d585fa04a Merge pull request #3729 from FHenry/3.7 
FIX : #3724 Bug: Blank page after cloning proposal with changed client
 2015-10-14 21:32:26 +02:00
Laurent Destailleur
a5b9a210ce Merge pull request #3725 from FHenry/3.8 
FIX : #3724 Bug: Blank page after cloning proposal with changed client
 2015-10-14 21:27:58 +02:00
Laurent Destailleur
f08d52b0e8 Merge pull request #3723 from atm-alexis/FIX_double_escape_entrepot 
FIX double db escape add too quote
 2015-10-14 21:27:39 +02:00