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

38878 Commits

Author SHA1 Message Date
Laurent Destailleur
14be79d3e8 Better help 
Bad var
 2015-01-28 20:04:18 +01:00
Laurent Destailleur
9850b753fa Tooltip at wrong place. 2015-01-28 19:37:09 +01:00
Laurent Destailleur
ad6af14edd Fixed: Status was not visible if selected. 2015-01-28 19:27:56 +01:00
Christophe Battarel
04f83ae4ff FIX: always show fournprice select 2015-01-28 16:19:56 +01:00
AcceTT Soluciones Computacionales
608b099934 Currency symbol in Mexico 
I tried to change the order of the currency symbol in Mexico is before.
 2015-01-26 21:38:43 -06:00
Maxime Kohlhaas
11dd32a8fd FIXED Import module was not working with multi-company and importing everything in entity 1 2015-01-26 23:37:25 +01:00
Laurent Destailleur
ffde00de81 Fixed date change was lost when changing event assignement. 2015-01-26 10:31:41 +01:00
Laurent Destailleur
da9f13bca9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-25 22:30:05 +01:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration. 
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
 2015-01-25 22:29:36 +01:00
Laurent Destailleur
b926a77325 Merge pull request #2280 from aspangaro/3.7-Accountancy 
FIXED Accounting module - Align integrate core version & module version 3.6
 2015-01-25 17:53:17 +01:00
Laurent Destailleur
8fb6ade27a Fix drag and drop in agenda view 2015-01-25 17:49:11 +01:00
Laurent Destailleur
3ebaaa38d2 Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC 2015-01-25 16:04:37 +01:00
aspangaro
68764ccea3 Debug 2015-01-25 15:35:34 +01:00
aspangaro
94a9d0159d Align module with 3.7 & contrary 2015-01-25 15:24:16 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
ad68b3ca6c Fixed approve during validation if user has permission 
Fixed error management
Fixed rendering country must be same for all tabs.
 2015-01-25 00:59:46 +01:00
Laurent Destailleur
568d5cb5ba Fixed: Tracking number restored on PDF shipments 
Fixed: Translation

Conflicts:
	htdocs/langs/en_US/agenda.lang
 2015-01-23 18:47:47 +01:00
Laurent Destailleur
aab7aacccf Bad width 2015-01-23 18:41:53 +01:00
Laurent Destailleur
a4990a58b1 The badge was missing for shipment 2015-01-23 18:39:40 +01:00
Laurent Destailleur
083cf06908 Fixed: Tracking number restored on PDF shipments 
Fixed: Translation
 2015-01-23 18:33:33 +01:00
Laurent Destailleur
5306220e5e Fixed: Translation 2015-01-23 02:21:43 +01:00
Laurent Destailleur
2e7bfa856a Fixed: bad url 2015-01-22 23:49:32 +01:00
Laurent Destailleur
b7328caa9a Fixed: Bad date for supplier orders 2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3 Fix: select if field is null 2015-01-22 20:10:25 +01:00
Laurent Destailleur
0f7238937a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/commande/fiche.php
 2015-01-22 18:55:26 +01:00
Laurent Destailleur
639d582a44 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 18:44:21 +01:00
Laurent Destailleur
36c083e9db Fixed: Refresh was doing update 2015-01-22 18:44:02 +01:00
Laurent Destailleur
e31decb3cf Merge pull request #2271 from aspangaro/3.7 
Correct link
 2015-01-22 13:57:30 +01:00
Laurent Destailleur
4bb86717cf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 12:30:18 +01:00
Laurent Destailleur
31be2563c2 Fixed: Allow external module a chance to fix regression. 2015-01-22 12:29:55 +01:00
aspangaro
6f3d9200bf Correct link 2015-01-22 07:15:14 +01:00
jean
b809f0aeb8 Merge remote-tracking branch 'origin/3.6' into 3.6 2015-01-20 17:31:17 +01:00
jean
5ec0b32ab0 add left joins on llx_c_actiocomm 2015-01-20 17:26:32 +01:00
Laurent Destailleur
8d0c8b888d Merge pull request #2263 from frederic34/patch-1 
Use account defined in invoice for pdf doc
 2015-01-19 15:31:26 +01:00
Laurent Destailleur
e14684c417 Merge pull request #2259 from marcosgdf/misc-fixes 
misc-fixes
 2015-01-19 15:28:28 +01:00
Frédéric FRANCE
69bb4b7b0b Use account defined in invoice for pdf doc 2015-01-18 23:00:26 +01:00
Laurent Destailleur
1dd76e2ec0 Avoid request if possible 2015-01-18 19:15:23 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
55b8c28100 Corrected weird typo 2015-01-18 16:28:42 +01:00
Marcos García de La Fuente
0b18ce5fc4 PHPDoc + missing return statements 2015-01-18 16:16:46 +01:00
Laurent Destailleur
08214999a7 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 15:21:38 +01:00
Laurent Destailleur
959fe14856 Merge pull request #2256 from marcosgdf/bug-1735 
Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes
 2015-01-18 15:14:23 +01:00
Laurent Destailleur
7b7b8f376f Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1784

Conflicts:
	ChangeLog
 2015-01-18 15:13:26 +01:00
Laurent Destailleur
ff65035aee Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1717

Conflicts:
	ChangeLog
 2015-01-18 15:12:00 +01:00
Laurent Destailleur
d1e2ab6f56 Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1783

Conflicts:
	ChangeLog
 2015-01-18 15:10:30 +01:00
Laurent Destailleur
7c5927ef93 Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1796

Conflicts:
	ChangeLog
 2015-01-18 15:08:49 +01:00
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Laurent Destailleur
c35de1aa06 Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1803

Conflicts:
	ChangeLog
 2015-01-18 15:01:18 +01:00
Laurent Destailleur
cef48d1275 Merge branch 'bug-1804' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1804

Conflicts:
	ChangeLog
 2015-01-18 14:02:52 +01:00
Laurent Destailleur
cf3a8f5a71 Merge pull request #2245 from KreizIT/fix_defaultE37 
Fix Creating default object from empty on supplier order confirmation
 2015-01-18 14:01:57 +01:00
Laurent Destailleur
0513ce25e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2015-01-18 13:51:45 +01:00
Laurent Destailleur
8644407c0a Merge pull request #2230 from defrance69/patch-42 
Update card.php
 2015-01-18 13:44:35 +01:00
Laurent Destailleur
05f08a7181 Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1762

Conflicts:
	ChangeLog
 2015-01-18 13:43:57 +01:00
frederic34
d45750d914 Ignore content of directory custom 
Conflicts:
	htdocs/custom/.gitignore
 2015-01-18 13:07:39 +01:00
Laurent Destailleur
b1f889e1d1 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 12:46:23 +01:00
Laurent Destailleur
2f4352c759 Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1785

Conflicts:
	ChangeLog
 2015-01-18 12:45:05 +01:00
Laurent Destailleur
19dbf7e2c6 Merge pull request #2185 from marcosgdf/bug-1765 
Fix: [ bug #1765 ] Unable to create a contract
 2015-01-18 12:39:25 +01:00
Laurent Destailleur
4639ce3364 Merge branch 'bug-1802' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1802

Conflicts:
	ChangeLog
 2015-01-18 12:37:16 +01:00
Laurent Destailleur
ef802d9c39 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2015-01-18 12:31:01 +01:00
Laurent Destailleur
6a294eb02a Fixed: Better fix for backward compatibility 2015-01-18 12:29:55 +01:00
Laurent Destailleur
012c571a6c Fixed: Backward compatibility 2015-01-18 11:50:53 +01:00
Marcos García de La Fuente
be3527abd1 Fixed some errors of Bookkeeping class 2015-01-18 03:23:00 +01:00
Marcos García de La Fuente
71e5cf07c6 Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes 2015-01-18 03:12:46 +01:00
Marcos García de La Fuente
78905c6af1 Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00
Marcos García de La Fuente
003aa5ee44 Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount 2015-01-17 19:41:31 +01:00
Marcos García de La Fuente
dacec491ff Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON 2015-01-17 19:37:49 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
cc9197e4c8 Fixed problem with Fichinter::getNextNumRef 2015-01-17 19:13:38 +01:00
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +01:00
Marcos García de La Fuente
ed839114ab Fixed loading of external numeration modules in FactureFournisseur and Propal 2015-01-17 18:42:19 +01:00
Marcos García de La Fuente
068045f6a0 Fix: [ bug #1803 ] AJAX company contact input is not aligned 2015-01-17 18:23:20 +01:00
Marcos García de La Fuente
a64084308d Fix: [ bug #1804 ] SQL error when sending email without addresee 2015-01-17 18:12:43 +01:00
Laurent Destailleur
06eda34b56 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-17 16:40:53 +01:00
Laurent Destailleur
9876b30387 Need more info to find bugs 2015-01-17 16:22:37 +01:00
Juanjo Menent
0d4aad4111 Fix: PostgreSQL compatibilty 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-01-16 17:59:58 +01:00
Juanjo Menent
fe5533d1c3 Fix: PostgreSQL compatibilty 2015-01-16 17:41:56 +01:00
Laurent Destailleur
6a900598a3 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-16 15:13:48 +01:00
Laurent Destailleur
41890d0a0b Fixed: Translation of module name and desc was not used for external 
modules.
 2015-01-16 14:38:00 +01:00
Laurent Destailleur
d1a0187f82 Merge pull request #2236 from marcosgdf/translations 
Corrected translation typos
 2015-01-16 12:10:32 +01:00
Laurent Destailleur
767afd3c9f Merge pull request #2231 from KreizIT/fix_cron 
Fix cron
 2015-01-16 12:08:30 +01:00
Laurent Destailleur
6f00cecd81 Merge pull request #2244 from KreizIT/fix_default_empty 
FIX : Creating default object from empty when validating supplier order
 2015-01-16 12:03:23 +01:00
KreizIT
a9008c4993 Fix Creating default object from empty on supplier order confirmation 2015-01-15 17:40:15 +01:00
Cedric
999a6052ff FIX : Creating default object from empty when validating supplier order 2015-01-15 16:23:10 +01:00
Marcos García de La Fuente
61809ef6b5 - Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database 2015-01-15 13:22:58 +01:00
Marcos García de La Fuente
88c3509dd0 Merge remote-tracking branch 'upstream/3.6' into 3.6 
Conflicts:
	ChangeLog
 2015-01-15 13:09:23 +01:00
Marcos García de La Fuente
71b609fab0 Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules 2015-01-15 13:08:33 +01:00
Juanjo Menent
f03ffaf5a3 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:00:52 +01:00
Juanjo Menent
d40eab2494 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.
 2015-01-15 09:57:20 +01:00
Laurent Destailleur
e20c1decdf Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +01:00
Laurent Destailleur
c5a3b4481e Fixed: use object 2015-01-15 03:11:06 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
4d67e6f4d4 Add ignore 2015-01-15 02:11:22 +01:00
Laurent Destailleur
ccfbd3614e Not nice looking 2015-01-15 02:09:28 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
68441a563a Fixed: Avoid space into address string 2015-01-14 19:17:58 +01:00
Laurent Destailleur
4c64b8ceae Add menu image 2015-01-14 19:12:22 +01:00
Laurent Destailleur
e3f3956bed Sec: Bad security test 2015-01-14 19:11:56 +01:00
Laurent Destailleur
806477977d Fix: css 2015-01-14 13:51:21 +01:00
Laurent Destailleur
a886136e67 More comment and add a unit test to check that {t} tag is correctly 
supported.
 2015-01-13 22:13:15 +01:00
Marcos García de La Fuente
4da52cf733 Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date 2015-01-13 11:11:37 +01:00
Marcos García de La Fuente
7b4cf976df Corrected translation typos 2015-01-13 09:42:46 +01:00
Marcos García de La Fuente
85b1188593 Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php 2015-01-13 09:22:12 +01:00
Marcos García de La Fuente
6c4702f282 Fix: [ bug #1785 ] Start date is lost in Project > Linked objects 2015-01-13 09:11:04 +01:00
Marcos García de La Fuente
7e16d0c1d3 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled 2015-01-13 01:48:58 +01:00
Laurent Destailleur
dc0d12eccd Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-12 19:00:29 +01:00
Laurent Destailleur
58e4e01db7 Sync transifex 2015-01-12 18:59:46 +01:00
Laurent Destailleur
31fd03790e Fixed: Prices visible into stock tab. 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-12 18:26:11 +01:00
Cedric
d2cd841573 Fix divide by zero error 2015-01-12 13:23:18 +01:00
Cedric
26cad2400e Fix missing lang key 2015-01-12 13:18:50 +01:00
BENKE Charles
b6b84e235c Update card.php 
hide line with empty duration if FICHINTER_HIDE_EMPTY_DURATION is activate
 2015-01-12 10:16:34 +01:00
Laurent Destailleur
a77a604082 Fix: include custom dir so everybody has it. 2015-01-11 15:32:11 +01:00
Laurent Destailleur
e4b89779f7 Fixed: css conflict 2015-01-10 21:39:40 +01:00
Laurent Destailleur
c441aa89db Fixed: Avoid warning 2015-01-10 18:19:44 +01:00
Laurent Destailleur
90add2fa96 Fix: amarok is a bugged theme making dolidroid failed. We swith to 
eldy automatically with dolidroid.
 2015-01-10 17:23:52 +01:00
Laurent Destailleur
dda12003d4 Fixed: User of creation was not visible. 2015-01-10 12:23:15 +01:00
Laurent Destailleur
30d1284379 Fixed: Missing ref_ext 2015-01-10 01:15:39 +01:00
Laurent Destailleur
87f70f2d22 Fixed: property must be called billed into web service. 
Fixed: web service to create order was useless. it was not possible to
change status.
 2015-01-10 01:07:18 +01:00
Laurent Destailleur
f7960ec104 Fixed: Upgrade are done several times 2015-01-09 23:19:18 +01:00
fentman
9049931ff0 Change to $listofcurrenciesbefore for GBP + AUD 
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
 2015-01-09 22:55:17 +01:00
Laurent Destailleur
dbcaeb01c0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
 2015-01-09 22:40:45 +01:00
Laurent Destailleur
32edb33411 Start 3.6.3 2015-01-09 22:32:25 +01:00
Laurent Destailleur
068ae7f0d4 - Fix: ref_ext was not saved when recording a customer order from web 
service
 2015-01-09 22:32:00 +01:00
Laurent Destailleur
f54e90c9cf Better doc to install external modules. 
Custom dir will be installed by default.
 2015-01-09 13:00:10 +01:00
Laurent Destailleur
b220bb7b1d Fixed: Size too low 2015-01-07 11:14:51 +01:00
Laurent Destailleur
f8792bdbc7 Fixed: Add opensurvey into list of reloaded modules for 3.7 2015-01-07 11:11:40 +01:00
Laurent Destailleur
4ee308c77b Fixed: Filter lost after search on date 2015-01-06 20:58:23 +01:00
Laurent Destailleur
2bf2c8fce7 Restore all requets 2015-01-06 00:34:23 +01:00
Laurent Destailleur
033757aafd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-01-06 00:33:28 +01:00
Laurent Destailleur
4ce7a27dca Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-01-06 00:28:07 +01:00
Laurent Destailleur
a668d163fd Repair corrupted data 2015-01-06 00:27:35 +01:00
Laurent Destailleur
b919318b53 Merge pull request #2213 from marcosgdf/opensurvey 
Fixed error deleting survey comment
 2015-01-06 00:21:32 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
Laurent Destailleur
908a95d83f Merge pull request #2211 from marcosgdf/contract-fixes 
Several Contract-related fixes
 2015-01-06 00:18:51 +01:00
Laurent Destailleur
3f7aab93e5 Merge pull request #2204 from defrance69/patch-39 
Update facture.php
 2015-01-06 00:14:42 +01:00
Laurent Destailleur
e5f81b1fec Merge pull request #2202 from defrance69/patch-38 
Update facture.php
 2015-01-06 00:13:55 +01:00
Laurent Destailleur
337d055872 Merge pull request #2199 from altatof/3.6 
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
 2015-01-06 00:10:08 +01:00
Laurent Destailleur
561ace5b0c Merge pull request #2219 from ndrosis/patch-11 
Fix Lang for Check Payment Type
 2015-01-06 00:07:38 +01:00
Laurent Destailleur
6a6c5c54f1 Merge pull request #2220 from aspangaro/3.7-Auguria 
Add module accountancy expert in auguria menu
 2015-01-06 00:07:26 +01:00
Laurent Destailleur
256cd68404 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-06 00:04:51 +01:00
Laurent Destailleur
3794c9305e Fix: [ bug #1754 ] Error while installing 3.7 2015-01-06 00:04:23 +01:00
Laurent Destailleur
5032f88e9f Merge pull request #2221 from aspangaro/3.7-Skype 
Skype :: Better presentation
 2015-01-05 23:52:28 +01:00
aspangaro
b4b5b35afa Skype :: Better presentation 2015-01-04 20:17:49 +01:00
Laurent Destailleur
d8d01090cd Fixed: Mark function as deprecated 2015-01-04 19:28:05 +01:00
Laurent Destailleur
48818ed2fd Fixed: Quick solution to solve problem of unknown payment amount for 
online subscription.
 2015-01-04 15:40:01 +01:00
Laurent Destailleur
df3987fa10 Fixed: Bad url link with jquery mobile. We must add rel="external" on 
all external links.
 2015-01-04 14:51:16 +01:00
aspangaro
f14ea7b649 Add module accountancy expert in auguria menu 2015-01-03 15:07:54 +01:00
Drosis Nikos
68049a2f0e Fix Lang for Check Payment Type 2015-01-02 18:10:47 +02:00
Laurent Destailleur
be34fcfa8a Removed duplicate link making same thing 2014-12-30 21:33:56 +01:00
Laurent Destailleur
410c8e56c6 Better fix 2014-12-30 04:30:32 +01:00
Laurent Destailleur
3848daeab8 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/stats/facture.php
 2014-12-30 04:20:50 +01:00
Marcos García de La Fuente
a9a33479f1 Fixed error deleting survey comment 2014-12-29 03:44:03 +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
2202380bc2 Improving ContratLigne documentation 2014-12-28 19:36:43 +01:00
Marcos García de La Fuente
7424ee1107 Improving Contrat documentation and fixed some properties usage 2014-12-28 19:28:25 +01:00
Marcos García de La Fuente
ef4d710f78 Improving CommonObject and Contrat documentation 2014-12-28 19:16:14 +01:00
Marcos García de La Fuente
ec7bc21e4c Fixed undefined variable $pu_ht 2014-12-28 19:01:39 +01:00
Marcos García de La Fuente
0b4bddd738 Fix [ bug #1779 ] Undefined variable $localtaxtx1 and $localtaxtx2 in Contrat::updateline 2014-12-28 18:57:59 +01:00
Marcos García de La Fuente
7670ae46a6 Fix [ bug #1778 ] Cancel button of edit ref. supplier contract card saves changes instead of cancelling 2014-12-28 18:56:23 +01:00
Marcos García de La Fuente
de137dd012 Merge branch 'bug-1767' into bug-1774 2014-12-28 18:16:16 +01:00
Marcos García de La Fuente
1a827a87f3 Merge branch 'bug-1775' into bug-1774 2014-12-28 18:16:02 +01:00
Marcos García de La Fuente
df1f931ab8 Fixed: [ bug #1767 ] Contract document is not generated properly 2014-12-28 18:10:41 +01:00
Marcos García de La Fuente
52b8bb350e Fixed Contrat::fetch not setting Contrat::date_creation and improved class doc 2014-12-28 18:10:30 +01:00
Marcos García de La Fuente
cd468b65fd Documented Contrat class 2014-12-28 17:55:21 +01:00
Laurent Destailleur
e70b6714ce Doxygen 
(cherry picked from commit 613d1b3)
 2014-12-28 17:50:38 +01:00
Marcos García de La Fuente
584be6a589 Fixed Contrat::fetch 2014-12-28 17:47:13 +01:00
Marcos García de La Fuente
b9d6f2a496 Fix: [ bug #1775 ] New lines can be entered after contract validation 2014-12-28 17:43:25 +01:00
Marcos García de La Fuente
d4e7a97fdb Fix: [ bug #1774 ] PHP Fatal error when creating a contract with Product module not enabled 2014-12-28 17:31:27 +01:00
Marcos García de La Fuente
98ed747671 Fix: [ bug #1765 ] Unable to create a contract 2014-12-28 17:17:08 +01:00
Marcos García de La Fuente
f738863e51 Revert previous commit 2014-12-28 17:14:11 +01:00
Marcos García de La Fuente
1b693fae7f Merge branch '3.7' into bug-1765 2014-12-28 17:11:30 +01:00
BENKE Charles
2957c1445e Update facture.php 
$soc already filled upper if $socid filled
 2014-12-28 12:34:21 +01:00
BENKE Charles
191d4467e3 Update facture.php 
$soc already filled upper when $socid send
 2014-12-28 12:31:27 +01:00
Christophe Battarel
1ab6955494 FIX: dont remove price ht if it is forced (ie: calculated by margin rate 
and cost price, or by external module)
 2014-12-27 11:27:41 +01:00
Laurent Destailleur
c7937a9962 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-27 02:22:09 +01:00
Laurent Destailleur
953e736a97 Prepare version 3.6.2 2014-12-27 02:21:37 +01:00
Marcos García de La Fuente
95c7ba33ba Merge branch '3.7' into bug-1765 2014-12-26 12:10:38 +01:00
Marcos García de La Fuente
9f6f90275a Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags 2014-12-26 12:03:29 +01:00
Juanjo Menent
bdf5f5726f Fix: Bad order field value 2014-12-26 09:29:27 +01:00
Juanjo Menent
d40229e9cc Fix: Bad order field value 2014-12-26 09:14:19 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
75dbcf4a78 Fixed: doxygen 2014-12-26 04:35:48 +01:00
Laurent Destailleur
d18770c1e7 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-12-26 04:16:08 +01:00
Laurent Destailleur
0e952c67ff Merge pull request #2193 from marcosgdf/bug-1761 
Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
 2014-12-26 04:14:03 +01:00
Laurent Destailleur
77e48f8c3e Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768 2014-12-26 04:12:58 +01:00
Laurent Destailleur
38c9d39c2b Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1757

Conflicts:
	ChangeLog
 2014-12-26 04:11:15 +01:00
Laurent Destailleur
4e2c321e4d Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-12-26 04:09:08 +01:00
Laurent Destailleur
0da1c2e589 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-26 04:06:10 +01:00
Laurent Destailleur
420ebe0be9 Fix: Change order to create fields 2014-12-26 04:04:16 +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
469aba888a Merge pull request #2184 from marcosgdf/bug-1674 
Fix: [ bug #1674 ] PayPal logo copyright issues
 2014-12-26 03:52:34 +01:00
Laurent Destailleur
bba8653179 Merge pull request #2183 from marcosgdf/bug-1724 
Fix: [ bug #1724 ] Can't add a submenu to projects
 2014-12-26 03:50:36 +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
Laurent Destailleur
ade688b589 Merge pull request #2174 from marcosgdf/bug-1723 
Fix [ bug #1723 ] Draft tasks?
 2014-12-26 03:48:15 +01:00
Laurent Destailleur
b2d27a7d25 Merge pull request #2173 from marcosgdf/translation 
Fixed string not translated in linked objects of a project
 2014-12-26 03:47:56 +01:00
Laurent Destailleur
8d4186f438 Merge pull request #2172 from marcosgdf/bug-1533 
Fix: [ bug #1533 ] Links triggers do not show trigger error message
 2014-12-26 03:47:05 +01:00
Marcos García de La Fuente
745eece5fe Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL 2014-12-26 00:34:57 +01:00
Marcos García de La Fuente
8e47fe9e1c Fix: [ bug #1757 ] Sorting breaks product/service statistics 2014-12-26 00:19:09 +01:00
Marcos García de La Fuente
1d39c1acc2 Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script 2014-12-26 00:12:16 +01:00