Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
44,842 Commits 36 Branches 189 Tags
dbcaeb01c0e9f6869e17fbe41546b4495b1298f5
Commit Graph

2804 Commits

Author SHA1 Message Date
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
ef4d710f78 Improving CommonObject and Contrat documentation 2014-12-28 19:16:14 +01:00
Laurent Destailleur
3c500158a9 Merge pull request #2187 from marcosgdf/bug-1715 
Fix [ bug #1715 ] Valign and width attributes are used in div tags
 2014-12-26 04:02:46 +01:00
Laurent Destailleur
5215b1e641 Merge pull request #2186 from marcosgdf/bug-575 
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
 2014-12-26 04:02:01 +01:00
Laurent Destailleur
54437703fb Merge pull request #2177 from frederic34/patch-7 
Enhance select_salesrepresentatives with select2
 2014-12-26 03:49:43 +01:00
Marcos García de La Fuente
2616deb58d Copyright info 2014-12-25 22:52:11 +01:00
Marcos García de La Fuente
eb524cfd29 Copyright info 2014-12-25 22:50:33 +01:00
Marcos García de La Fuente
7b6a4d1bfd Fix: [ bug #1715 ] Valign and width attributes are used in div tags 2014-12-25 22:50:15 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Marcos García de La Fuente
1179f722af Merge branch '3.7' into bug-1533 2014-12-25 01:26:00 +01:00
Frédéric FRANCE
d03cc03cd7 Enhance select_salesrepresentatives with select2 2014-12-23 16:42:05 +01:00
Laurent Destailleur
acf7b9f130 Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-23 12:59:34 +01:00
Marcos García de La Fuente
8a14409974 Fix: [ bug #1533 ] Links triggers do not show trigger error message 2014-12-23 11:39:43 +01:00
Laurent Destailleur
31f782ffe9 Fix: Several fixes into tasks and time spent management 2014-12-21 14:58:18 +01:00
Laurent Destailleur
22c27e8703 PHPCS 2014-12-21 02:21:12 +01:00
Laurent Destailleur
268723be7b Fixed: sql syntax error 2014-12-21 01:39:20 +01:00
Laurent Destailleur
c9f3267649 Fixed: bad conditions 2014-12-20 11:34:37 +01:00
Laurent Destailleur
854ed90a62 Fixed: bad place for the ajaxcombo. 2014-12-20 11:15:10 +01:00
Laurent Destailleur
ef5035b349 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/liste.php
 2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php
 2014-12-18 10:13:25 +01:00
Laurent Destailleur
f5da9b5e33 Merge pull request #2149 from altatof/3.5 
FIX: dont put a mess with date and datetime extrafield value if already in right format
 2014-12-18 10:04:03 +01:00
Laurent Destailleur
6728ad3c37 Merge pull request #2148 from altatof/fixhook 
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
 2014-12-18 10:03:32 +01:00
Laurent Destailleur
0b6ff8f9bc Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not 
be finished. We keep it as development status.
 2014-12-14 20:41:11 +01:00
Christophe Battarel
27b47a4f48 FIX: dont put a mess with date and datetime extrafield value if already 
in right format (the bug was in propale/order/invoice extrafields,
mainly visible with 2 datetime extrafields)
 2014-12-12 14:31:36 +01:00
Christophe Battarel
a1bba472a0 FIX: hook insertExtraFields must return a returnvalue (0,1,-1) 2014-12-12 11:57:20 +01:00
Laurent Destailleur
c994fbe44d Fixed: Bad style 2014-12-11 14:31:47 +01:00
Laurent Destailleur
7834a9b099 Add hidden constant to solve bug of too low size to see products label. 2014-12-10 00:51:57 +01:00
aspangaro
81dc1415de Untranslatable token in activity box 2014-12-09 05:04:39 +01:00
Laurent Destailleur
a8052d8ea4 Fixed: Several fix in color management (function at wrong place, mark 
param that are deprecated, convertion of value to get correct
format in all situation)
 2014-12-08 19:12:27 +01:00
Laurent Destailleur
c35018be5f Fixed: Translations 2014-12-07 18:24:45 +01:00
Laurent Destailleur
0b766b1f47 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-07 12:11:26 +01:00
Laurent Destailleur
ff23b0c0a6 Fix: No print 2014-12-07 12:10:50 +01:00
Florian HENRY
aaf2cca45f Fix bug n sellist extrafield filtered 2014-12-05 21:25:43 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch. 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 16:04:37 +01:00
Laurent Destailleur
bff65fc6b4 Fix: starting with var with always same color 2014-12-05 01:25:18 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
b5d74372de Bad var 2014-12-04 01:36:53 +01:00
Laurent Destailleur
f3584fa211 Fixed: Button at wrong place 
Fixed: Must use style css span badge for number of files
 2014-12-01 00:53:15 +01:00
Laurent Destailleur
20e76aa4e6 Fixed: Use constant to hide a feature that will probably be broken. Also 
it is a superfluous feature.
 2014-11-30 02:05:45 +01:00
Laurent Destailleur
278cdf72d6 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 12:41:26 +01:00
Laurent Destailleur
e118d9af22 Fixed: Protection to lock language setup in demo mode was not working 2014-11-29 12:11:12 +01:00
Laurent Destailleur
6843bfcc15 Fix typo 2014-11-28 00:01:59 +01:00
Laurent Destailleur
7a18240d2f Doxygen 2014-11-23 23:22:49 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
d8767bfbae Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/class/product.class.php
 2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-22 16:03:09 +01:00
Laurent Destailleur
2f4de2ef75 Merge pull request #2016 from altatof/3.5 
FIX: copy extrafields when creating order from propale and creating
 2014-11-22 16:02:13 +01:00
BENKE Charles
730bf1c25c Update html.formcontract.class.php 
bad filtering on contract list (same sql rule as project)
 2014-11-22 15:41:18 +01:00
Laurent Destailleur
b644075faa Fix: doxygen 2014-11-20 23:41:58 +01:00