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

1289 Commits

Author SHA1 Message Date
Laurent Destailleur
2704f50bd4 Merge branch 'bug-1577' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1577

Conflicts:
	ChangeLog
 2014-09-14 21:31:51 +02:00
Laurent Destailleur
f0d4ebe417 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-09-14 21:26:56 +02:00
Marcos García de La Fuente
7bac9444e6 [ bug #1546 ] Incorrect page number when searching in the list of bank transactions 2014-09-14 14:32:17 +02:00
Marcos García de La Fuente
9426298b95 [ bug #1548 ] Supplier payment card shows type in French 2014-09-14 14:19:46 +02:00
Marcos García de La Fuente
7a28f8e4aa [ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger 2014-09-14 13:59:06 +02:00
Marcos García de La Fuente
afd631e6e3 [ bug #1577 ] When creating new Private individual third, selected third type is ignored 2014-09-14 13:22:05 +02:00
Marcos García de La Fuente
74e16db632 [ bug #1589 ] Menu type in "Edit menu" page is not translated 2014-09-14 13:14:03 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
7851587a11 Merge pull request #1869 from FHenry/3.6 
Extrafield feature select from table should try to translate multiple column when not needed
 2014-09-11 17:13:28 +02:00
Laurent Destailleur
31eb4bda88 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/compta/facture.php
 2014-09-06 00:26:11 +02:00
aspangaro
f054d624cd Merge branch 'Upstream/3.6' 2014-09-05 20:59:44 +02:00
aspangaro
71832b5944 Changelog 2014-09-05 20:55:40 +02:00
Florian HENRY
85cabbf921 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-04 18:29:17 +02:00
Laurent Destailleur
da8a1cb475 Fix: Iban was used instead of Bic into SEPA file. 
Fix: Must unaccent strings into SEPA file.
 2014-09-04 15:38:20 +02:00
Florian HENRY
b04eae95e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-03 11:44:37 +02:00
Laurent Destailleur
257d7c41d6 Merge pull request #1863 from FHenry/3.6 
Fix: list event view lost type event filter
 2014-09-02 19:34:17 +02:00
Laurent Destailleur
e82e26c6fa Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
 2014-09-02 12:57:33 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
Florian HENRY
832d1b37c1 Save also code of event 2014-09-02 11:32:38 +02:00
Florian HENRY
911aca399d save code event 2014-09-02 11:30:35 +02:00
Florian HENRY
c8a9f4600c Fix: list event view lost type event filter 2014-09-02 11:20:57 +02:00
Florian HENRY
67b308cb25 Fix: list event view lost type event filter 2014-09-02 11:15:01 +02:00
Florian HENRY
e2fac5dd91 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-01 19:10:18 +02:00
Juanjo Menent
4372c58714 Fix: Unsubscribe emailing not working 2014-09-01 18:24:25 +02:00
Florian HENRY
db1c97bdad changelog 2014-09-01 11:52:20 +02:00
Juanjo Menent
0e1f22fe26 Fix: Salary payments are not reflected on the reporting sheets 2014-08-28 15:16:14 +02:00
Laurent Destailleur
4405f17f22 Update changelog 2014-08-26 23:47:44 +02:00
Laurent Destailleur
12c6752971 Fix: Can upload files on services. 2014-08-26 23:45:02 +02:00
Laurent Destailleur
2cba55758b Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into 
KreizIT-fix_1544

Conflicts:
	ChangeLog
 2014-08-21 23:29:38 +02:00
Laurent Destailleur
3f8ec47e91 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
 2014-08-16 17:37:37 +02:00
Laurent Destailleur
3336b5bdce Fix: [ bug #1553 ] Saving User displays setup removes menu 2014-08-16 17:35:19 +02:00
Laurent Destailleur
f0c9513fa9 Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead 
of old ref
 2014-08-16 17:18:53 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/theme/eldy/graph-color.php
 2014-08-15 02:28:16 +02:00
Cedric
8670a89ecb Fix #1544: Can remove date from invoice 2014-08-14 08:41:24 +02:00
Florian HENRY
329c0b2913 Fix: Missing include files.lib.php in some pages ti use 
dol_delete_recursive
 2014-08-13 12:42:55 +02:00
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
Laurent Destailleur
d0c3a7913f Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:15:18 +02:00
Laurent Destailleur
230b1d4bb8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	test/phpunit/SqlTest.php
 2014-08-06 10:28:37 +02:00
Laurent Destailleur
86c6709d02 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:10:13 +02:00
Laurent Destailleur
c781bb4d08 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/holiday/fiche.php
 2014-08-06 09:12:29 +02:00
Laurent Destailleur
2d524f2edc Fix: Holiday module was broken. Initializaion of amount of holidays 
failed.
 2014-08-06 09:09:22 +02:00
Laurent Destailleur
131c8398ce Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 00:13:48 +02:00
Laurent Destailleur
b182b2ff44 Update changelog 2014-08-06 00:11:42 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2014-08-04 22:18:30 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with 
enter keyboard input instead of lens click)
 2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	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/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Marcos García de La Fuente
280ecf1243 Merge remote-tracking branch 'upstream/3.6' into changelog 2014-07-23 06:25:21 +02:00
Marcos García de La Fuente
f31f0cc0a9 Updated changelog for 3.6 2014-07-23 06:25:12 +02:00
Juanjo Menent
8cd2e00e5f Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders
 2014-07-21 16:57:08 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Laurent Destailleur
f55814e3b2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-07-14 23:11:33 +02:00
Juanjo Menent
3a8835892e Fix: Import ProfId1 to siren and ProfId2 to siret 
Conflicts:
	ChangeLog
 2014-07-14 19:42:54 +02:00
Juanjo Menent
3816e0fe14 Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:39:08 +02:00
Marcos García de La Fuente
4bc8e026b6 [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly 2014-07-13 19:51:44 +02:00
juanjo
c1bfe0f6c5 Update ChangeLog: Remove add_photo_web() 2014-07-11 22:00:41 +02:00
Florian HENRY
7d77772820 changelog 2014-07-11 11:45:59 +02:00
Laurent Destailleur
7ee1388582 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-07-04 12:22:10 +02:00
Laurent Destailleur
c1d33af50d - Fix: [ bug #1517 ] Packages sizes. 2014-07-02 20:11:08 +02:00
Laurent Destailleur
ea310efba5 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger
 2014-07-02 19:57:18 +02:00
Laurent Destailleur
57b546650a Fix: Hide title of event when agenda module disabled. 2014-06-30 19:03:52 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to 
sender.
 2014-06-28 14:48:00 +02:00
Laurent Destailleur
fc4493242a Merge pull request #1685 from KreizIT/3.6 
FIX : #1477, #1478, #1479
 2014-06-26 21:00:26 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Cedric
ee91f4a3f7 FIX : #1477, #1478, #1479 2014-06-25 13:37:55 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
Laurent Destailleur
04ead87aea Merge pull request #1681 from KreizIT/FIX1485 
FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
 2014-06-23 20:20:31 +02:00
Cedric
7ced580abc Add fix to changelog 2014-06-23 12:35:37 +02:00
Laurent Destailleur
b4add020a9 Fix: Question about warehouse must not be done when module stock is 
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
 2014-06-23 11:47:07 +02:00
Laurent Destailleur
d19b34cc7e Fix: Renaming a project with uplaoded files failed. 2014-06-21 15:45:53 +02:00
Laurent Destailleur
76532218c2 Fix: [ bug #1476 ] Invoice creation form loses invoice date when there 
is a validation error
 2014-06-21 15:35:30 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
28fd8c6862 Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top 
margin.
 2014-06-20 14:04:37 +02:00
Laurent Destailleur
a2065d0b6a Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a 
supplier order.
 2014-06-20 13:49:59 +02:00
Laurent Destailleur
fcb00b2024 Fix: [ bug #1425 ] 2014-06-20 13:38:44 +02:00
Laurent Destailleur
f7654107f9 Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object 
Fix 1455 outstanding amount
 2014-06-20 13:22:08 +02:00
Laurent Destailleur
c903fe9340 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-06-20 13:20:07 +02:00
Laurent Destailleur
1cffc8d8f6 Merge branch '3.5' of github.com:fappels/dolibarr into fappels-3.5 2014-06-20 13:18:28 +02:00
Laurent Destailleur
6740e0321a Merge pull request #1670 from FHenry/3.5 
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
 2014-06-20 13:16:11 +02:00
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:48:08 +02:00
Florian HENRY
40f5911f52 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 
product (on supplier order part)
 2014-06-20 09:36:31 +02:00
Francis Appels
5b5473bc7c Fix: [ bug #1509 ] Expedition admin submit error 
Expedition admin free text & watermark submit error
 2014-06-19 10:02:58 +02:00
Florian HENRY
0645189432 If multiprice level is used the VAT on addline is not correct 2014-06-18 10:56:38 +02:00
Florian HENRY
7f92031583 Changelog 2014-06-17 11:31:20 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project 
card
 2014-06-17 11:18:30 +02:00
Laurent Destailleur
0c5c1cf849 Merge branch '3.5' of github.com:FHenry/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 13:21:32 +02:00
Laurent Destailleur
0453daae72 Merge pull request #1656 from netfab/3.5 
html fix : missing </tr>.
 2014-06-14 12:34:06 +02:00
Laurent Destailleur
710497a081 Merge branch 'bug-1451' of github.com:marcosgdf/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 12:32:59 +02:00
Laurent Destailleur
cf948065f4 Fixes for bug 1449, 1450 and 1451 #1654 2014-06-14 12:30:48 +02:00
Laurent Destailleur
c67dad0240 Merge branch 'bug-1432' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1432

Conflicts:
	ChangeLog
 2014-06-14 12:27:47 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Florian HENRY
f796a6408e Do not display dictionnay for non activated module 2014-06-12 15:28:11 +02:00
Florian HENRY
80facefa23 Fix [ bug #1454 ] Mention de bas de page erroné 2014-06-12 09:13:51 +02:00
Laurent Destailleur
40742e84a9 Fix: Bad balance of colspan. 
Fix: Filter on status was not visible when selected from url.
Fix: Filtering on status was last when asking to sort.
 2014-06-11 16:47:00 +02:00
Fab
2fed26d68b html fix : missing </tr>. 2014-06-11 08:01:05 +02:00