Laurent Destailleur
a26a7cedf8
Qual: Uniformize code. Trigger PROJECT_BUILDDOC is removed because
...
building a doc is not a business event. For technical action after
creation of a pdf, hook "afterPDFCreation" must be used instead.
2014-08-19 14:51:10 +02:00
Laurent Destailleur
7437eb8088
New: On contact list can set filter on both active and not active (no
...
more exclusive select).
2014-08-19 14:40:20 +02:00
aspangaro
f774ff487b
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
Laurent Destailleur
be6f99c10e
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/db/mysql.class.php
htdocs/core/db/mysqli.class.php
htdocs/core/lib/ajax.lib.php
2014-08-17 19:34:12 +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
7edf2eacea
New: Each user can include its own external ics calendar into dolibarr
...
agenda view.
2014-08-15 17:08:05 +02:00
Laurent Destailleur
96cb9fe6cb
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-15 02:35:06 +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
Laurent Destailleur
80a68a8295
Update changelog
2014-08-14 01:05:37 +02:00
Laurent Destailleur
18b44ccfae
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Laurent Destailleur
69d23b3ea0
Merge branch 'task1218' of github.com:KreizIT/dolibarr into
...
KreizIT-task1218
Conflicts:
ChangeLog
2014-08-14 00:24:08 +02:00
Laurent Destailleur
cc86e280f9
Merge branch 'task712' of github.com:KreizIT/dolibarr into
...
KreizIT-task712
Conflicts:
ChangeLog
2014-08-14 00:18:51 +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
Florian HENRY
bab7533578
Enable supplier price log table
2014-08-12 18:16:59 +02:00
Florian HENRY
db7478098a
Add a real free numbering module for contract
2014-08-12 13:26:06 +02:00
aspangaro
1a87d98357
Qual: Renamed table llx_c_civilite into llx_c_civility
...
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
aspangaro
6fd77e7ef6
Merge branch 'Upstream/develop'
2014-08-11 13:26:58 +02:00
Laurent Destailleur
b713bd7b88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-08-11 11:31:10 +02:00
Laurent Destailleur
d85f319a86
New: Select list of users can return user into hierarchy.
2014-08-11 11:29:47 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
KreizIT
9bf32603fe
[ task #1218 ] Can drag and drop an event from calendar to change its day.
2014-08-08 14:25:14 +02:00
Laurent Destailleur
4922071af9
New: When a translation is not available we always jump to en_US and
...
only en_US.
2014-08-08 10:50:37 +02:00
Laurent Destailleur
111d215ef1
Merge pull request #1807 from atm-maxime/develop
...
New: Intervention documents are now available in ECM module
2014-08-08 01:56:33 +02:00
Laurent Destailleur
2eea7cdc7f
New: Intervention documents are now available in ECM module
2014-08-08 01:55:45 +02:00
Laurent Destailleur
42d992b009
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
2014-08-08 01:26:53 +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
KreizIT
973d61fe13
[ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice
2014-08-07 16:23:02 +02:00
Laurent Destailleur
055397a94b
New: Can attach supplier order to a customer order.
2014-08-07 15:12:27 +02:00
Maxime Kohlhaas
3b14fa2b35
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-08-07 12:27:46 +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
35d2e4f84c
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-06 10:30:58 +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
Maxime Kohlhaas
5e63f16d32
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
...
Conflicts:
ChangeLog
2014-08-06 09:58:10 +02:00
Maxime Kohlhaas
3622b472dd
Changelog
2014-08-06 09:57:20 +02:00
Laurent Destailleur
82921232f5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
2014-08-06 09:27:01 +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
1751b58ef8
New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or
...
content template.
2014-08-06 00:46:00 +02:00
Laurent Destailleur
e77be9e529
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-06 00:15:14 +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
Maxime Kohlhaas
90c397d1a4
New: Intervention documents are now available in ECM module
2014-08-05 15:24:49 +02:00
Laurent Destailleur
c2be3364e0
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-04 22:19:53 +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
Laurent Destailleur
1f2cc71975
New: Supervisor is now visible into user list.
2014-08-03 11:36:00 +02:00
Laurent Destailleur
7c1af329f2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2014-08-01 22:26:17 +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
600801a442
- New: First change to match accessibility rules:
...
http://www.w3.org/TR/WCAG10-HTML-TECHS/
Differentiate text and img.
Use label into quick search form.
Use accesskey on form search.
2014-07-29 22:04:53 +02:00
Laurent Destailleur
b57371bfa1
Fix: New: Differentiate text and img for better accessibility.
2014-07-29 20:21:01 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
bf9313dd87
getBrowserInfo can return type of layout (classic/phone/tablet)
2014-07-27 20:56:26 +02:00
Laurent Destailleur
b964f9e9e3
New: Add info page about browser.
...
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
2014-07-27 14:13:25 +02:00
Laurent Destailleur
3d56c8ff6a
Fix: [ bug #1537 ] Difference between societe.nom and adherent.societ
2014-07-26 18:20:40 +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
Laurent Destailleur
5caa7ccd13
Merge pull request #1765 from marcosgdf/patch-3
...
Added formConfirm and doAction for supplier invoice card
2014-07-25 22:17:09 +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
Marcos García de La Fuente
f3cbe1beac
Task #1511 and updated changelog
2014-07-23 06:20:17 +02:00
Marcos García de La Fuente
4f582609f4
Added formConfirm and doAction for supplier invoice card
2014-07-22 04:24:08 +02:00
Juanjo Menent
acaca341ab
Fix: [ bug #1521 ] The second order's page from a provider shows all
...
orders
Conflicts:
ChangeLog
2014-07-21 17:00:59 +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
04a20d2008
- New: Enable feature developed for 3.6 we forgot to enabled: Adding
...
prefix on uploaded file names.
- New: No more dependency between contract and service module.
2014-07-19 22:05:35 +02:00
Laurent Destailleur
92a5ebc459
- New: Home page of project area shows list of draft project (like other
...
main page).
- New: Can search on project ref or string from project main page (like
other main page).
2014-07-17 01:28:01 +02:00
Laurent Destailleur
8a8a90de78
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-07-15 23:30:15 +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
ccf32636f8
Fix: Import ProfId1 to siren and ProfId2 to siret
...
Conflicts:
ChangeLog
2014-07-14 19:43:59 +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
Florian HENRY
494e5b20a5
chnagelog
2014-07-12 10:17:04 +02:00
Florian HENRY
d0cc935cd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-12 10:16:08 +02:00
KreizIT
b6edde320b
Conflict solved
2014-07-12 09:20:00 +02:00
KreizIT
9c2aaf7d23
[ Task #1495 ] Add trigger LINECONTRACT_CREATE
2014-07-12 00:27:33 +02:00
KreizIT
ff19a87941
[Task #1481 ] Enable BILL_SUPPLIER_MODIFY trigger
2014-07-11 23:40:17 +02:00
juanjo
d27ec6306c
Update ChangeLog: Remove add_photo_web()
2014-07-11 22:03:06 +02:00
juanjo
c1bfe0f6c5
Update ChangeLog: Remove add_photo_web()
2014-07-11 22:00:41 +02:00
Florian HENRY
d2e17eb321
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-07-11 16:09:01 +02:00
KreizIT
ca97c0bef3
Refactor: RESOURCE_* trigger
2014-07-11 16:06:06 +02:00
KreizIT
bbdaa59921
Refactor: ORDER_SUPPLIER_* and LINEORDER_SUPPLIER_* trigger
2014-07-11 15:32:23 +02:00
KreizIT
b8499a80ec
Refactor: LINK_* trigger
2014-07-11 15:08:01 +02:00
KreizIT
fc61cc9bfa
Refactor: BILL_* and LINEBILL_* trigger
2014-07-11 14:36:13 +02:00
Laurent Destailleur
4dfaf9ce38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661
New: Type of thirdparties can accept a country (to show list of types
...
specific for a country).
2014-07-11 13:56:35 +02:00
Laurent Destailleur
5c81074483
Merge pull request #1709 from KreizIT/review_trig2
...
Review trig2
2014-07-11 12:27:43 +02:00
Florian HENRY
7d77772820
changelog
2014-07-11 11:45:59 +02:00
Florian HENRY
c7d31f4570
[ task #1204 ] Add ref_int contract field
2014-07-11 11:26:54 +02:00
Laurent Destailleur
682d765de9
New: Add country iso code on 3 chars into table of countries.
2014-07-09 00:16:28 +02:00
Laurent Destailleur
1a2ed2138b
New: Add new type of event (when type of events are used, not by
...
default)
2014-07-06 21:25:25 +02:00
Laurent Destailleur
ce3fa14511
New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to
...
create an automatic event into agenda.
Qual: Removed hard coded rowid into data init.
2014-07-06 19:25:15 +02:00
Laurent Destailleur
823e976f39
Change the way parameters are provides to scripts
...
sync_xxx_ldap2dolibarr.php
2014-07-05 12:27:35 +02:00
KreizIT
c5bb55064f
Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
2014-07-04 17:10:19 +02:00
KreizIT
e4ad082214
Fix: [ bug #1506 , #1507 ] ECM trigger error problem
2014-07-04 16:39:54 +02:00
KreizIT
c70bdabeda
Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
2014-07-04 16:23:10 +02:00
KreizIT
4666de85e2
Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message
2014-07-04 16:18:54 +02:00
KreizIT
012fc4e8fe
Fix: [ bug #1465 , #1466 ] Product triggers problem
2014-07-04 15:54:20 +02:00
KreizIT
1ded34aa97
Fix: [ bug #1498 , #1499 ] Shipment/Delivery triggers problem
2014-07-04 15:33:16 +02:00
KreizIT
fc6382ea7e
Fix: [ bug #1463 , #1464 ] Proposal triggers problem
2014-07-04 15:15:36 +02:00
Laurent Destailleur
42f33fc10e
New: Add option PRODUCT_MAX_VISIBLE_PHOTO to limit number of photos
...
shown on main product card.
2014-07-04 15:14:14 +02:00
Laurent Destailleur
6144f90770
New: Form to add a photo is immediatly available on photo page if
...
permissions are ok (save one click per photo to add).
2014-07-04 15:06:45 +02:00
Laurent Destailleur
e496823778
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
ChangeLog
htdocs/fourn/commande/fiche.php
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
htdocs/product/stock/replenish.php
2014-07-04 14:14:40 +02:00
Laurent Destailleur
7ee1388582
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-07-04 12:22:10 +02:00
KreizIT
e0201535e2
Fix: [ bug #1505 , #1504 ] Project trigger problem
2014-07-03 17:15:42 +02:00
KreizIT
023e7ce8ce
FIX : [ bug #1502 ] DON_CREATE trigger does not intercept trigger action
...
- Add DON_CREATE in interface_90_all
- Add new trigger DON_UPDATE, DON_DELETE
2014-07-03 16:04:12 +02:00
KreizIT
07f2d9474e
FIX: [ bug #1494 ] CATEGORY_CREATE and CATEGORY_MODIFY triggers do not intercept trigger action
2014-07-03 15:52:37 +02:00
KreizIT
538cf90f5e
FIX : [ bug #1496 ] ACTION_DELETE trigger does not show trigger error
...
-Add ACTION_* trigger in interface_90_all
2014-07-03 15:39:40 +02:00
KreizIT
f0323e5b80
FIX: Contract's trigger problem
2014-07-03 15:21:43 +02:00
KreizIT
685b7b23ad
FIX: Member's trigger problem
2014-07-03 15:09:46 +02:00
KreizIT
174edb6140
FIX: Intervention trigger
2014-07-03 14:57:16 +02:00
KreizIT
7d30df42a2
ChangeLog modification
2014-07-03 14:15:15 +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
e2472351c3
Merge branch 'fix1487' of github.com:KreizIT/dolibarr into
...
KreizIT-fix1487
Conflicts:
ChangeLog
2014-06-29 23:42:38 +02:00
Laurent Destailleur
330c965cb9
New: Add hook "searchAgendaFrom".
2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5
New: Can filter events on a group of users.
2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3
New: Can create proposal from an intervention.
2014-06-28 19:47:51 +02:00
Laurent Destailleur
2c493a4fe3
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-06-28 14:55:04 +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
KreizIT
a153480bc6
Fix : [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
...
Change trigger call to new function call_trigger
2014-06-27 13:48:23 +02:00
Juanjo Menent
6ce1ef08cf
[ task #867 ] Remove ESAEB external module code from core
2014-06-27 09:09:08 +02:00
Laurent Destailleur
e2790895ad
Prepare 3.7 development.
2014-06-26 21:48:57 +02:00
Laurent Destailleur
a2f610ffbe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
Laurent Destailleur
abfe36620a
Merge pull request #1686 from KreizIT/movetrig
...
Fix [ bug #1459 ]
2014-06-26 21:01:48 +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
KreizIT
92f1778c9d
Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error
...
Start refactoring trigger call from within object
2014-06-25 16:51:26 +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
9bb537f399
- New: If multilangue is enabled, mail (from propal, invoice, etc...)
...
message is pre-defaulted in Customer language
2014-06-18 09:59:15 +02:00
Florian HENRY
df9f153142
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-06-17 12:01:45 +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
Marcos García de La Fuente
ff37adf6f1
Fix: [ bug #1451 ] Interrupted order clone through trigger, loads nonexistent order
2014-06-10 13:47:30 +02:00
Marcos García de La Fuente
7cb5cc550f
Didn't mean to change this entry of the changelog
2014-06-10 13:41:17 +02:00
Marcos García de La Fuente
b9801a8b3c
Missing changelog
2014-06-10 13:32:47 +02:00
Marcos García de La Fuente
900b182f3c
Updated changelog
2014-06-10 12:22:31 +02:00
Marcos García de La Fuente
0c1ba58a00
Fix: [ bug #1449 ] Trigger ORDER_CREATE ignores interception on error
2014-06-10 12:13:27 +02:00
Marcos García de La Fuente
e7cfb719b9
[ bug #1432 ] Trigger SHIPPING_CREATE ignores interception on error
2014-06-10 12:05:31 +02:00
Laurent Destailleur
47c982c506
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2014-06-10 08:45:08 +02:00
Laurent Destailleur
41adaeea99
Merge branch 'bug-1443' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1443
Conflicts:
ChangeLog
2014-06-10 01:42:39 +02:00
Laurent Destailleur
5853b9eb30
Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1416
Conflicts:
ChangeLog
2014-06-10 01:37:43 +02:00
Laurent Destailleur
9e91225936
Merge pull request #1648 from marcosgdf/bug-1415
...
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
2014-06-10 01:28:56 +02:00
Marcos García de La Fuente
85d906078a
Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or limit date for payment
2014-06-09 23:50:57 +02:00
Marcos García de La Fuente
0b73b44f34
Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the supplier order card
2014-06-09 23:38:06 +02:00
Marcos García de La Fuente
83b58aca89
Typo
2014-06-09 22:49:27 +02:00
Marcos García de La Fuente
0810e6756a
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
2014-06-09 22:48:16 +02:00
Laurent Destailleur
171227e43a
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2014-06-06 12:00:21 +02:00
Marcos García de La Fuente
4c11e37203
Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text
2014-06-03 15:45:03 +02:00
Laurent Destailleur
fc2bd4ab4e
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
...
report
(cherry picked from commit bd061f4 )
2014-06-02 02:16:49 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
a63d085181
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-05-23 20:22:40 +02:00
Laurent Destailleur
07bc933110
Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1405
Conflicts:
ChangeLog
2014-05-23 20:21:41 +02:00
Laurent Destailleur
649fdd72dc
Merge pull request #1622 from marcosgdf/bug-1410
...
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
2014-05-23 20:20:22 +02:00
Laurent Destailleur
2771c506e9
Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1407
Conflicts:
ChangeLog
2014-05-23 20:17:41 +02:00
Laurent Destailleur
d1ee20dd42
Merge branch 'bug-1411' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1411
Conflicts:
ChangeLog
2014-05-23 20:11:13 +02:00
Laurent Destailleur
dc94b6e1bf
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-05-23 20:08:43 +02:00
Laurent Destailleur
9c398b14c5
Merge branch 'bug-1397' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1397
Conflicts:
ChangeLog
2014-05-23 20:06:40 +02:00
Marcos García de La Fuente
fa733c8ba4
Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande
2014-05-23 11:42:14 +02:00
Laurent Destailleur
2c05146778
Merge pull request #1621 from marcosgdf/bug-1388
...
Fix: [ bug #1388 ] Wrong date when invoicing several orders
2014-05-23 11:34:41 +02:00
Marcos García de La Fuente
a705d4e333
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
2014-05-23 03:00:46 +02:00
Marcos García de La Fuente
0d121de1a6
Fix: [ bug #1388 ] Wrong date when invoicing several orders
2014-05-23 02:48:24 +02:00
Marcos García de La Fuente
77c09d887a
Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes
2014-05-23 02:44:02 +02:00
Marcos García de La Fuente
b2f299f5e4
Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled
2014-05-23 02:22:38 +02:00
Marcos García de La Fuente
603c28dcdd
[ bug #1397 ] Filter by supplier orders with status Draft does not filter
2014-05-23 02:04:02 +02:00
Florian HENRY
2a16a562d9
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2014-05-22 12:51:55 +02:00
Florian HENRY
87b9d0412c
Fix element page on project
2014-05-22 12:51:00 +02:00
Laurent Destailleur
94335b186e
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Laurent Destailleur
c82ff0a146
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2014-05-21 19:51:05 +02:00
Laurent Destailleur
4a89446162
Fix: When number reach 9999 with default numbering module, next number
...
will be 10000 instead of 0000 and error.
2014-05-21 19:47:41 +02:00
Florian HENRY
5a5c858578
[ bug #1399 ] [pgsql] Silent warning when setting a propal as
...
"facturée" in propal.php
2014-05-19 16:21:59 +02:00
Laurent Destailleur
b7f55ea99c
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Marcos García de La Fuente
39b0ed7fc2
Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice.
2014-05-14 22:47:19 +02:00
Laurent Destailleur
bd061f4245
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
...
report
2014-05-13 01:29:01 +02:00
Laurent Destailleur
5f0c4dbe48
Fix: TCPDF error file not found in member card generation
2014-05-12 10:07:57 +02:00
Laurent Destailleur
6f4a390780
Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error
2014-05-11 19:06:17 +02:00
Laurent Destailleur
bcfc9f8aa1
Fix: [ bug #1381 ] PHP Warning when listing stock transactions page
2014-05-11 18:06:30 +02:00
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
Laurent Destailleur
7bb24969d8
Fix: [ bug #1372 ] Margin calculation does not work in proposals
2014-05-10 19:52:24 +02:00
Laurent Destailleur
4e41b721fb
Fix: Nb of notes and doc not visible onto tasks.
2014-05-10 16:43:47 +02:00
Laurent Destailleur
d76683a116
New: Add hooks on project card page.
2014-05-08 20:07:16 +02:00
Laurent Destailleur
7bfbc4cbf3
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/modExpedition.class.php
htdocs/projet/class/project.class.php
2014-05-07 19:30:19 +02:00
Laurent Destailleur
40577ab445
New: Can enter holiday for someone else if user has permission for.
2014-05-07 15:03:05 +02:00
Marcos García de La Fuente
fb7f08b33a
Corrected changelog message
2014-05-07 10:43:19 +02:00
Marcos García de La Fuente
7fe5389adf
Updated changelog
2014-05-07 10:41:43 +02:00
Laurent Destailleur
a127f09377
- New: Paypal/paybox email sent after backcall of a payment is now a
...
formated and translated HTML content. For member subscription
renewal, there is also a link to member.
- New: When a subscription is recorded with invoice and payment: the
document (PDF) of invoice is also generated and the invoice is set
to status paid.
2014-05-07 10:33:10 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
fe43d10c79
Fix: [ bug #1360 ] note indicator for member tab.
2014-05-06 23:42:19 +02:00
Laurent Destailleur
5a6ad1ef5f
Fix: [ bug #1362 ] Note is not saved
...
Fix: tr/td balance.
2014-05-06 23:19:48 +02:00
Laurent Destailleur
460b5296ba
Fix: [ bug #1353 ] Email notifications, wrong URL
2014-05-06 22:21:34 +02:00
Laurent Destailleur
215ff25ddd
Fix: navigation on tab notes for shipment was not working.
2014-05-06 13:51:22 +02:00
Laurent Destailleur
4da918ce01
Update doc
2014-05-06 13:32:37 +02:00
Juanjo Menent
a4f1c7eb50
Fix: Suppliers invoice mask fails using {tttt} in numbering
...
Conflicts:
ChangeLog
2014-05-06 10:04:02 +02:00
Juanjo Menent
011fe254a6
Fix: Suppliers invoice mask fails using {tttt} in numbering
2014-05-06 09:59:10 +02:00
Laurent Destailleur
63100c9c06
Properties "civilite_id" were renamed into "civility_id".
2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51
New: The combo list of juridical status is now sorted
2014-05-04 23:46:36 +02:00
Laurent Destailleur
2bba72640b
Merge branch 'composer' of github.com:GPCsolutions/dolibarr into
...
GPCsolutions-composer
Conflicts:
composer.json
2014-05-04 21:15:41 +02:00
Laurent Destailleur
c9ebe7729f
Merge branch 'bug-1371' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1371
Conflicts:
ChangeLog
2014-05-04 17:56:24 +02:00
Laurent Destailleur
697f68c9a9
Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5
...
Conflicts:
ChangeLog
2014-05-04 17:43:47 +02:00
Laurent Destailleur
03f9f0bada
Fix: Pb of records not correctly cleaned when module marge is
...
uninstalled (conflict between 'margin' and 'margins').
2014-05-03 20:21:35 +02:00
Laurent Destailleur
f34a9983bd
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
...
Fix: Can disable features with CKEDITOR.
2014-05-03 02:22:37 +02:00
Marcos García de La Fuente
4599b22cb5
Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents
2014-05-02 17:15:56 +02:00
Florian HENRY
a4126fae66
[ bug #1341 ] Lastname not added by file or direct input in mass
...
e-mailing
2014-05-01 18:13:01 +02:00
Laurent Destailleur
6a200105b9
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
ChangeLog
2014-05-01 11:16:42 +02:00
aspangaro
d1392f7a5f
Changelog
2014-04-30 06:58:14 +02:00
Florian HENRY
91505fdebe
changelog
2014-04-28 17:24:14 +02:00
Florian HENRY
79fabb05b5
changelog
2014-04-28 17:23:13 +02:00
Florian HENRY
7a46bdfc55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-04-28 17:20:40 +02:00
Florian HENRY
dddbc37d35
Enable option clone target emailing
2014-04-28 17:18:11 +02:00
Laurent Destailleur
4a23a8a789
Merge branch 'category_translate' of github.com:aternatik/dolibarr into
...
aternatik-category_translate
Conflicts:
ChangeLog
2014-04-28 02:39:56 +02:00
Laurent Destailleur
ac07dd5a8c
Update doc
2014-04-28 02:38:33 +02:00
Laurent Destailleur
e5c5b15ecc
Qual: Start to clean module ECM (Code is to complex). Prepare for
...
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
2014-04-28 01:46:11 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
bd8cdd337a
Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
2014-04-26 22:17:11 +02:00
Laurent Destailleur
950c59eb61
Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers.
2014-04-26 17:34:39 +02:00
Laurent Destailleur
6968304641
Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
2014-04-26 17:27:59 +02:00
Laurent Destailleur
c54d9d9171
Fix: [ bug #1351 ] VIES verification link broken
2014-04-26 16:27:06 +02:00
jfefe
6b1a57d1b7
Update changelog
2014-04-25 16:13:58 +02:00
Laurent Destailleur
298da30200
New: Extrafields can be used as substitution key %EXTRA_XXX% into emails
...
texts for members.
2014-04-25 14:39:34 +02:00
Laurent Destailleur
01655d1757
New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send
...
invoice
by email whatever is its status.
2014-04-23 13:14:55 +02:00
Juanjo Menent
d527c4cf73
Fix: Price min of composition is not supplier price min by quantity
2014-04-22 09:57:43 +02:00
Laurent Destailleur
1c21dbc9e7
Merge pull request #1533 from FHenry/develop
...
Add filter date and total line on bank writing list page
2014-04-19 23:58:48 +02:00
Laurent Destailleur
bb2c829997
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
2014-04-18 12:34:32 +02:00
Laurent Destailleur
2213128531
Fix: invert label for accountancy_code_sell
2014-04-18 12:08:12 +02:00
Laurent Destailleur
ce34c01b9e
New: On page to enter supplier prices, if there is no supplier, add
...
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
2014-04-16 00:06:16 +02:00
Florian Henry
57e4453ea2
Add filter date and total line on bank writing list page
2014-04-13 18:26:21 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Juanjo Menent
f458c384d7
Fix: Can not make withdrawals
...
Conflicts:
ChangeLog
2014-04-11 12:10:04 +02:00
Juanjo Menent
75e76dc232
Fix: Can not make withdrawals
2014-04-11 12:07:01 +02:00
Laurent Destailleur
60b37dffe1
Fix: [ bug #1323 ] generation of odt files for tasks.
2014-04-09 00:07:32 +02:00
Laurent Destailleur
174d4f6ff2
Prepare 3.5.2
2014-04-05 16:15:04 +02:00
Laurent Destailleur
9a8a306d78
Qual: Method form->select_currency() has been removed. Use instead
...
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64
New: Can filter on status for supplier order.
2014-04-02 12:48:34 +02:00
Laurent Destailleur
d5986caed2
Fix: [ bug #1318 ] Problem with enter key when adding an existing
...
product to a customer invoice.
2014-04-02 12:00:01 +02:00
Laurent Destailleur
7ac193bb80
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/opensurvey/public/choix_autre.php
2014-04-02 11:41:55 +02:00
Laurent Destailleur
46e46507ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/action/index.php
htdocs/compta/bank/class/account.class.php
htdocs/compta/bank/index.php
2014-04-02 11:33:47 +02:00
Laurent Destailleur
8cb06cac08
FIX : [ bug #1317 ] Removing a category does not remove all child
...
categories
2014-04-02 11:27:11 +02:00
Laurent Destailleur
7f23bec7c4
Update changelog
2014-03-31 02:21:45 +02:00
Juanjo Menent
a1fb21114b
New: Add some hooks for financial reports
2014-03-28 18:31:43 +01:00
Juanjo Menent
638e90eb67
Fix: Margin tabs bad data show
2014-03-28 18:23:28 +01:00
Juanjo Menent
acb752c5f2
Fix: Margin tabs bad data show
2014-03-28 18:22:44 +01:00
Marcos García de La Fuente
c8c77dbdcf
Fix: Agenda and Banks module were not working with multicompany module
2014-03-22 18:59:48 +01:00
Juanjo Menent
d98a5d4c6f
Fix: [ bug #1306 ] Fatal error when adding an external calendar
2014-03-22 13:01:38 +01:00
Juanjo Menent
e0b4bd9b0d
Fix: [ bug #1306 ] Fatal error when adding an external calendar
2014-03-22 13:00:23 +01:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/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.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
Laurent Destailleur
44952e353d
Fix: Bad format for fk_currency fields (even if they are not used, i fix
...
them).
2014-03-19 11:46:06 +01:00
Laurent Destailleur
80088c87ac
Fix: Some debugs of module categories
2014-03-18 00:20:39 +01:00
Juanjo Menent
19a3088055
Fix: Add actions events not implemented
2014-03-17 17:05:55 +01:00
Laurent Destailleur
14d8bfef3a
New: Improved Opensurvey module: Description of survey use wysiwig
...
editor, More information shown on result tab, Renamed "survey" into
"poll" (better translation).
2014-03-17 12:40:12 +01:00
Laurent Destailleur
987acd233d
Update log
2014-03-15 21:35:21 +01:00
Laurent Destailleur
4154f07dfd
New: Add a public url as a property for products/services.
2014-03-14 13:51:46 +01:00
Laurent Destailleur
da5610bf3f
Merge branch 'es_CL-language' of https://github.com/marcosgdf/dolibarr
...
into marcosgdf-es_CL-language
Conflicts:
ChangeLog
2014-03-13 23:40:43 +01:00
Laurent Destailleur
6cec011df6
New: Add manager name (ceo, director, president...) into main company
...
information page.
2014-03-13 12:22:53 +01:00
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
3c842f9b6f
New: Add barcode fields into user database.
2014-03-13 09:11:14 +01:00
Laurent Destailleur
8d081525ae
Merge pull request #1464 from marcosgdf/changelog
...
Updated changelog
2014-03-11 11:55:08 +01:00
Laurent Destailleur
c9edced656
- New: Add filter on project status into task list. By default, only
...
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
2014-03-11 09:43:26 +01:00
Marcos García de La Fuente
20262a0164
Fix bug #1295 : Error when creating an agenda extrafield with a number as reference
2014-03-10 23:58:16 +01:00
Marcos García de La Fuente
78ec0054d9
Added bug number for agenda extrafield problems
2014-03-10 23:33:09 +01:00
Marcos García de La Fuente
4209ad740c
Updated changelog
2014-03-10 23:20:48 +01:00
Marcos García de La Fuente
89a4c51153
Added es_CL language
2014-03-10 21:13:16 +01:00
Laurent Destailleur
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
Laurent Destailleur
260dfe3844
Merge pull request #1454 from marcosgdf/locale-line-odt-tags
...
Locale line ODT tags
2014-03-06 18:34:33 +01:00
Laurent Destailleur
cd3e56a2d0
Merge pull request #1450 from grandoc/develop
...
fix english misspelling
2014-03-06 18:23:51 +01:00
Marcos García de La Fuente
2c22c7707f
Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags
2014-03-06 08:55:37 +01:00
Laurent Destailleur
6f60755426
New: Add option MAIN_FAVICON_URL
2014-03-05 17:26:59 +01:00
Laurent Destailleur
60327e92d1
New: Add filter on text and status into survey list. Can also sorter on
...
id, text and date end.
2014-03-05 11:22:01 +01:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
748d769140
Fix: [ bug #1280 ] service with not end of date was tagged as expired.
2014-03-02 15:50:26 +01:00
Laurent Destailleur
c6fb7996ba
Fix: [ bug #1238 ] When creating accompte with a %, free product are
...
used for calculation.
2014-03-01 19:11:13 +01:00
Laurent Destailleur
b6cefee45a
Fix: [ bug #1240 ] traduction
2014-03-01 15:21:11 +01:00
Laurent Destailleur
0b83f1a670
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-03-01 15:06:25 +01:00
Laurent Destailleur
8d28087e69
Fix: [ bug #1206 ] PMP price is bad calculated
2014-03-01 14:58:33 +01:00
Laurent Destailleur
a084887442
Merge branch 'project-translations' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations
Conflicts:
ChangeLog
2014-03-01 13:38:50 +01:00
Laurent Destailleur
19b68e87e9
Merge branch 'bug-1123' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1123
Conflicts:
ChangeLog
2014-03-01 13:29:34 +01:00
simnandez
afebf86bf1
Fix: Loading actions extrafields fails.
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-26 16:55:42 +01:00
simnandez
8ffa11fe16
Fix: Loading actions extrafields fails.
2014-02-26 16:50:38 +01:00
Laurent Destailleur
480b09f192
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Laurent Destailleur
e8cadf3a3e
New: Add form search customer order on commercial main page.
2014-02-25 18:33:04 +01:00
Marcos García de La Fuente
968b5771db
Corrected project contact types translation
2014-02-25 02:42:10 +01:00
Marcos García de La Fuente
e83e2bbbd7
Fixed bug #1123 : Paid deposit invoices are always shown as partially paid when fully paid
2014-02-25 01:17:38 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
simnandez
92a8fde88b
New: Automatic events for sending mails showing info about mail linked
...
objects.
2014-02-21 12:53:06 +01:00
Laurent Destailleur
e5136487bd
Fix: The customer code was set to uppercase when using numbering module
...
leopard. We must keep data safe of any change.
2014-02-20 16:51:37 +01:00
simnandez
c2db656c86
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:33:22 +01:00
simnandez
7511f626b3
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:32:20 +01:00
Laurent Destailleur
0b7f623c31
New: Add an admin page to make a mass init of barcode values for all
...
products.
2014-02-19 17:04:21 +01:00
Laurent Destailleur
5a29b3d546
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/societe/soc.php
2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916
Fix: Bad space in predefined messages.
...
Fix: Signature was not added for email sent from thirdparty page.
2014-02-19 15:33:04 +01:00
Laurent Destailleur
867c83680b
Merge remote-tracking branch 'origin/3.5' into develop
2014-02-17 18:22:49 +01:00
Laurent Destailleur
1cfcda702e
Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not
...
work.
2014-02-17 17:32:25 +01:00
Laurent Destailleur
860ca15cfc
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2014-02-17 15:27:30 +01:00
Laurent Destailleur
de64ce5b2a
Fix: user right on Holiday for month report nor working
2014-02-17 00:09:48 +01:00
Laurent Destailleur
abc96b51fa
Enable extrafields for customer order, proposal and invoice lines. This
...
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
2014-02-16 23:51:29 +01:00
Laurent Destailleur
908c39098d
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-16 19:47:51 +01:00
Laurent Destailleur
4b8d39af9d
Fix: Do not report trigger errors twice.
...
Fix: Error when creating event was not reported.
Conflicts:
htdocs/comm/action/fiche.php
2014-02-14 13:05:04 +01:00
Laurent Destailleur
444bc1c6a1
New increase length of url into bookmark module.
2014-02-10 16:05:13 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
fdfb7f1a8a
Fix: Be sure there is no duplicate default rib.
2014-02-08 03:24:48 +01:00
Laurent Destailleur
5b89bc18f5
[ bug #1231 ] PDF always generated in interventions
2014-02-08 02:46:05 +01:00
Laurent Destailleur
b750e98d40
Fix: Pb of file upload and download.
2014-02-08 02:02:01 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +01:00
Laurent Destailleur
e5cd32623c
Qual: Uniformize code of payment between customer and supplier payments.
...
New: Add warning if supplier payment is higher that due amount.
2014-02-03 18:42:24 +01:00
Laurent Destailleur
7f15aa4582
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
a2afea7ba9
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-30 18:21:04 +01:00
Laurent Destailleur
16811a6077
Move changelog from 3.5 to 3.6 to remind there is still work to do.
2014-01-30 01:43:30 +01:00
Laurent Destailleur
35ddcf2958
Remove from changelog because feature is not stable.
2014-01-30 01:42:32 +01:00
Laurent Destailleur
ebd8d5f8dd
New: Can input barcode during product creation step.
2014-01-28 19:11:22 +01:00
Laurent Destailleur
5657bd7793
New: Can create contract from an order.
2014-01-28 15:26:20 +01:00
Laurent Destailleur
8d916215cc
New: Add new hook function addMoreActionsButtons to allow a module to
...
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Laurent Destailleur
8d8e016115
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-20 02:42:37 +01:00
Laurent Destailleur
fb0a4803c2
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
2014-01-20 02:40:06 +01:00
Laurent Destailleur
0d18892506
Merge from 3.4
2014-01-20 02:21:30 +01:00
Laurent Destailleur
8642e2027c
Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal
...
vulnerability
2014-01-20 02:10:16 +01:00
Laurent Destailleur
1ebd56c4ee
New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE
2014-01-20 00:40:01 +01:00
Laurent Destailleur
699a079ed7
New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and
...
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
2014-01-20 00:31:32 +01:00
Laurent Destailleur
b5620d5f15
New: The box "balance of bank accounts" show all opened accounts.
2014-01-15 17:52:16 +01:00
Laurent Destailleur
c3360c4c30
Fix: Bad merge
2014-01-12 14:51:54 +01:00
Laurent Destailleur
06aa3b8250
Merge branch 'opensurvey-improvements' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements
Conflicts:
ChangeLog
2014-01-12 14:50:00 +01:00
Laurent Destailleur
02989b9f32
New: An external module can add tabs with a label that is a dynamic
...
value.
Qual: The deprecated way (with 4 parameters) to declare a new tab into a
module descriptor file has been removed. You must now use the 6
parameters way. See file modMyModule.class.php for example.
2014-01-12 14:11:03 +01:00
Laurent Destailleur
eaf3bd5679
Update doc
2014-01-11 13:34:39 +01:00
Laurent Destailleur
9b9492a5d6
New: Start to work on option MAIN_AUTO_TIMESTAMP_IN_NOTES to
...
automatically add timestamp and user line into comment. Remain to do:
Add button "cancel" into note edition mode.
2014-01-10 01:31:23 +01:00
Laurent Destailleur
eae92695d6
Fix: Warning into bank conciliation feature.
2014-01-09 18:47:33 +01:00
Laurent Destailleur
2b4f0bd4b1
Fix: Add a limit into list to avoid browser to hang when database is too
...
large.
2014-01-09 14:28:32 +01:00
Laurent Destailleur
6ff337ccad
New: Add option 'aZ' into GETPOST function to check parameters
...
contains only a to z or A to Z characters.
2014-01-08 00:10:39 +01:00
Laurent Destailleur
9a33d67527
Update doc
2014-01-08 00:07:05 +01:00
Laurent Destailleur
c7ef0b7c57
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
simnandez
035670dce3
Fix: Bad get of localtaxes into contracts add lines
2014-01-07 12:18:50 +01:00
simnandez
b8550bb985
Fix: Bad get of localtaxes into contracts add lines
2014-01-07 12:16:56 +01:00
simnandez
d4db5916f0
Fix: Bad get of localtaxes into contracts add lines
2014-01-07 12:16:16 +01:00
Laurent Destailleur
e99883f1a6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/admin/modules.php
2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2014-01-06 19:13:40 +01:00
Marcos García de La Fuente
2313ea01dd
Updated changelog
2014-01-06 05:46:47 +01:00
Marcos García de La Fuente
b8b7dbbed4
Created triggers OPENSURVEY_CREATE and OPENSURVEY_DELETE
2014-01-05 22:05:56 +01:00
Laurent Destailleur
555a49d66e
Update doc
2014-01-05 01:20:27 +01:00
Laurent Destailleur
6c3c66c45d
New: Add menu entry to barcode genration page.
2014-01-04 12:29:20 +01:00
Laurent Destailleur
f0503dfaa9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/compta/stats/cabyprodserv.php
htdocs/compta/stats/casoc.php
2014-01-03 18:28:00 +01:00
Laurent Destailleur
8d66497384
Update doc for 3.4.2
2014-01-03 18:23:07 +01:00
Marcos García de La Fuente
5f3d2aea51
Opensurvey polls tab cards can now be extended from external modules
2014-01-02 16:32:48 +01:00
Laurent Destailleur
ddde3339f8
Merge remote-tracking branch 'origin/3.5' into develop
...
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
2013-12-31 16:33:36 +01:00
Laurent Destailleur
0bdcda50c6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
build/exe/doliwamp/doliwamp.iss
build/pad/pad_dolibarr.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377
Fix: Update doc and packager for doliwamp
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
2013-12-31 15:41:25 +01:00
Laurent Destailleur
a337517193
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
2013-12-30 11:37:43 +01:00
Laurent Destailleur
49f3242796
Merge pull request #1357 from marcosgdf/payment_menu
...
Payment menu
2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-26 19:43:31 +01:00
Marcos García de La Fuente
917ddf0dee
Payments and Supplier payment pages tabs can now be extended from modules.
2013-12-25 03:16:57 +01:00
Laurent Destailleur
fcfe94d4ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
simnandez
bf333d4f54
Fix: Some config data are shared between suppliers orders and suppliers
...
invoices
2013-12-23 16:39:37 +01:00
simnandez
d6b2f96c19
Fix: Some config data are shared between suppliers orders and suppliers
...
invoices
2013-12-23 16:38:38 +01:00
Florian Henry
e971e4dfff
Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal
2013-12-23 11:05:14 +01:00
Laurent Destailleur
acc4850d20
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-12-19 20:57:24 +01:00
Laurent Destailleur
b35f44e3cb
New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs
...
when you use the "print" view on screen.
2013-12-19 20:57:13 +01:00
simnandez
03e2901070
Fix: Lost stats filters into year selection
2013-12-19 15:45:40 +01:00
simnandez
a1e0d84e37
Fix: Lost stats filters into year selection
2013-12-19 15:43:22 +01:00
Laurent Destailleur
c1ee59eef9
Qual: Add phpunit tests for margin lib
2013-12-16 14:10:52 +01:00
Marcos García
d65374bb02
Fixed bug #1196 : Product barcode search does not expect 13th digit on EAN13 type
...
Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891
2013-12-15 18:44:53 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
dc754bbdc2
Fix: Trigger name conflicts and reference file was not matching real
...
name of triggers.
2013-12-14 20:48:34 +01:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
8fb0986303
New: Add path file of trigger into admin trigger list page
2013-12-10 15:49:57 +01:00
Laurent Destailleur
72250f656e
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-09 02:17:43 +01:00
Marcos García de La Fuente
beb93e9245
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 20:23:44 +02:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Florian Henry
bc4cfd66db
Fix: fix unsubscribe URL into mailing when sending manually (not by
...
script)
2013-12-02 15:07:34 +01:00
Florian Henry
11efc20755
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b
2013-12-01 22:50:18 +01:00
Florian Henry
c6991f97d4
[ bug #1174 ] Product translated description not good into PDF
...
Country
2013-12-01 22:47:22 +01:00
Laurent Destailleur
4aea74d6fd
Fix: [ bug #1171 ] Documents lost in interventions after validating
2013-12-01 21:05:22 +01:00
Laurent Destailleur
131bbce6f3
Update changelog
2013-12-01 20:17:22 +01:00
Laurent Destailleur
fdc1209986
Fix: [ bug #1163 ] SQL Error when searching for supplier orders
...
Conflicts:
ChangeLog
2013-12-01 18:12:15 +01:00
Laurent Destailleur
84e3457023
Fix: [ bug #1161 ] Search on product label
2013-12-01 16:30:35 +01:00
Laurent Destailleur
8f1a553395
Fix: [ bug #1162 ] Traduction des mi-journées
2013-12-01 16:22:06 +01:00
Laurent Destailleur
395066519b
Fix: [ bug #1163 ] SQL Error when searching for supplier orders
2013-12-01 16:18:18 +01:00
Laurent Destailleur
b6386a3dce
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/tpl/objectline_add.tpl.php
2013-12-01 16:08:03 +01:00
Laurent Destailleur
d39ed05c5d
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/propal/list.php
2013-12-01 16:05:09 +01:00
Laurent Destailleur
5715e9c986
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-28 17:06:11 +01:00
Laurent Destailleur
bdf8100d84
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/product/stats/commande_fournisseur.php
2013-11-28 15:54:12 +01:00
Florian Henry
b9d37fd6f7
[ bug #1159 ] Commercial search "other" give p.note do not exists
2013-11-28 14:28:03 +01:00
Florian Henry
6615ee7e6f
[ bug #1148 ] Product consomation : supplier order bad status
2013-11-23 14:59:28 +01:00
simnandez
58a8f590e6
New: Add graph stats for suppliers orders in tab "stats" on products.
2013-11-22 14:47:16 +01:00
Florian Henry
f852c9a5bb
Fix [ bug #1145 ] Agenda button list type do not display
2013-11-22 14:43:15 +01:00
simnandez
5d34953200
New: Add list of orders products in tab "consumption" on thirdparties.
2013-11-22 14:30:29 +01:00
Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Florian Henry
68718c6100
Update changelog
2013-11-19 10:42:29 +01:00
Laurent Destailleur
a92aa14459
Merge pull request #1299 from altairis-fr/3.4
...
fix wrong buy price update (confusion between entity and npr !)
2013-11-15 05:04:07 -08:00
aspangaro
200553c001
Update ChangeLog
2013-11-15 04:58:59 +01:00
Christophe Battarel
d23130739b
update ChangeLog
2013-11-13 18:43:31 +01:00
Laurent Destailleur
34d598d9e6
Update changelog, prepare 3.5.
2013-11-13 12:49:23 +01:00
Laurent Destailleur
db9e9a3372
Prepare 3.5.0 beta
2013-11-07 00:41:27 +01:00
aspangaro
092c98e6aa
Changelog & lang en_US for Skype module
2013-11-05 20:51:32 +01:00
Grand Philippe
8f43b2f2c0
language
2013-11-04 14:11:33 +01:00
Florian Henry
6aea0bf7a1
Fix [ bug #1105 ] Searching Boxes other search option
2013-11-02 12:49:37 +01:00
Laurent Destailleur
469dd03673
Merge remote-tracking branch 'origin/3.4' into develop
...
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/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/filefunc.inc.php
htdocs/langs/nl_NL/margins.lang
2013-11-01 17:58:38 +01:00
Laurent Destailleur
84b36d1230
Prepare for 3.4.2
2013-11-01 17:24:09 +01:00
Christophe Battarel
ba0273ccc4
fix bad rounding on margin calculation and display
2013-10-30 18:17:37 +01:00
Laurent Destailleur
5b3ba85669
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-10-29 18:07:12 +01:00
Laurent Destailleur
70342c09b8
Fix: Better management of using ajax for upload form (to solve problem
...
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
2013-10-29 17:52:13 +01:00
Laurent Destailleur
93c5720579
New: Add path to installed dir of external modules + Name and web of
...
module provider.
2013-10-28 01:37:04 +01:00
Laurent Destailleur
837d5f2e76
Qual: Normalize code of vat class
...
New: Can enter a vat payment of zero.
2013-10-25 19:27:38 +02:00
Laurent Destailleur
9ad9571f86
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-10-20 14:29:27 +02:00
Laurent Destailleur
315e2e4c13
Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into
...
defrance69-patch-14
Conflicts:
htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-10-20 14:12:56 +02:00
Florian Henry
9555cb35f0
Add project clone option : copy project files, copy task files
2013-10-19 17:51:21 +02:00
Laurent Destailleur
16b2741834
New: Finished page to make mass stock movement
2013-10-18 19:23:27 +02:00
Laurent Destailleur
0d36329336
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-10-14 15:56:42 +02:00
Laurent Destailleur
8661d9bfa0
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2013-10-13 13:40:12 +02:00
Laurent Destailleur
559b75c49b
New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID.
2013-10-11 12:14:14 +02:00
Laurent Destailleur
141258f514
Merge remote-tracking branch 'origin/3.4' into develop
...
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT
Conflicts:
htdocs/fourn/product/liste.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2013-10-07 16:17:51 +02:00
Christophe Battarel
c41794ba4c
update changelog
2013-10-05 10:23:24 +02:00
Florian Henry
d41ceae64a
- New: Can choose contact on event (action com) creation, and filtred by
...
thirdparty
2013-10-01 18:11:53 +02:00
Laurent Destailleur
957ff08458
New: Add update method for web service product.
2013-10-01 11:59:35 +02:00
Laurent Destailleur
019c86dff0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8
New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
2013-09-28 13:24:58 +02:00
Christophe Battarel
7bc39d7601
update changelog
2013-09-26 19:08:54 +02:00
Laurent Destailleur
065c87d81c
Qual: uniformize code: property ->tel on objects is now ->phone
...
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
1f938e6596
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-25 12:16:54 +02:00
Laurent Destailleur
f5387081e0
Update doc
2013-09-25 11:25:30 +02:00
Laurent Destailleur
12b15d3ae0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-09-24 18:23:02 +02:00
Laurent Destailleur
3378855694
New: Can cancel holidays that were previously validated
2013-09-24 18:06:07 +02:00
Christophe Battarel
b197231c04
fix bad margin calculation for credit notes
2013-09-24 17:49:56 +02:00
Christophe Battarel
af06f53eaf
clean changelog
2013-09-24 15:56:27 +02:00
Christophe Battarel
aa820d56ba
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
is reverts commit 8a4041e534 .
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/install/mysql/migration/3.4.0-3.5.0.sql
htdocs/societe/class/societe.class.php
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
2013-09-24 15:52:19 +02:00
Laurent Destailleur
cb04b05e85
New: Can send an email from thirdparty card.
2013-09-23 13:17:31 +02:00
Laurent Destailleur
9a475e9ed2
New: Add method to use a dictionnary as a combo box.
2013-09-22 23:54:01 +02:00
Laurent Destailleur
3d62303d59
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-19 01:02:53 +02:00
Laurent Destailleur
8de0de08ef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
build/debian/get-orig-source.sh
2013-09-19 00:53:09 +02:00
Laurent Destailleur
921777449f
New: [ task #90 ] Barcode search
2013-09-16 17:10:49 +02:00
Laurent Destailleur
9826b202e9
New: Provide both tags for string formated amount and numeric amount
...
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
2013-09-16 12:42:01 +02:00
Laurent Destailleur
949b8c6274
Mark method classer_facturee deprecated.
...
Make better translation of some workflow options.
2013-09-16 11:50:53 +02:00
Christophe Battarel
1636acf5e2
update changelog
2013-09-15 19:13:09 +02:00
Christophe Battarel
775d259f88
Fix: Supplier price displayed on document lines and margin infos didnt take discount
2013-09-15 14:52:41 +02:00
Christophe Battarel
d9d90f1088
Fix: Supplier price displayed on document lines didnt take discount
...
Conflicts:
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-15 12:04:46 +02:00
simnandez
4c7907b773
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-15 11:47:31 +02:00
Christophe Battarel
6959ccf627
Fix: Supplier price displayed on document lines didnt take discount
2013-09-15 11:41:41 +02:00
simnandez
002e248f00
Fix: [ bug #1062 ] Documents lost in propals and contracts validating
2013-09-12 16:55:49 +02:00
simnandez
817569d487
Fix: [ bug #1062 ] Documents lost in propals and contracts validating
2013-09-12 16:54:47 +02:00
Laurent Destailleur
0bb18cb05c
New: Can use tag {mm} before {yy} even when there is a reset into
...
numbering masks.
Qual: Enhance phpunit tests to include this case.
2013-09-11 14:18:56 +02:00
simnandez
af89a794a0
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:06:15 +02:00
simnandez
43beb38c9b
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:04:36 +02:00
Laurent Destailleur
1b526b7aa5
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
.travis.yml
htdocs/fourn/facture/index.php
2013-09-09 20:00:12 +02:00
Laurent Destailleur
104d394128
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
.travis.yml
2013-09-09 17:16:24 +02:00
Laurent Destailleur
afe58abdcd
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
2013-09-08 21:51:37 +02:00
Christophe Battarel
9fa37fc5f1
Fix: Edit propal line was losing product supplier price id
...
Conflicts:
ChangeLog
2013-09-08 21:51:08 +02:00
Florian Henry
2740cc78b6
Add dol_syslog
...
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
2013-09-05 17:45:30 +02:00
Florian Henry
d8ddb8b3e7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f
Add ref supplier into muscadet model
2013-09-03 20:07:08 +02:00
Florian Henry
cb86cd403c
Fix: Delete linked element to supplier invoice when deleted (as done for
...
all other object into dolibarr)
2013-09-03 20:01:10 +02:00
simnandez
58e2c4e38e
Fix: compatiblity with multicompany module
2013-09-02 10:08:38 +02:00
simnandez
83042459a5
Fix: compatiblity with multicompany module
2013-09-02 10:07:44 +02:00
simnandez
2a8aa50163
Fix: Intervention box links to contracts id
...
Conflicts:
htdocs/core/boxes/box_ficheinter.php
2013-08-29 12:12:02 +02:00
simnandez
b86e20f0e6
Fix: Intervention box links to contracts id
2013-08-29 12:05:29 +02:00
simnandez
a321264a2a
Fix: Localtaxes balance not showing
...
Conflicts:
ChangeLog
2013-08-29 10:03:32 +02:00
simnandez
fa4a9c73c4
Fix: Localtaxes balance not showing
2013-08-29 09:58:07 +02:00
Florian Henry
cc90c92cc0
Fix: Mailing module : if an email is already in destinaires list all
...
other email from selector was not inserted
2013-08-28 16:33:21 +02:00
simnandez
34fe1fba7f
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:45:24 +02:00
simnandez
dfd14f4430
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:44:00 +02:00
Laurent Destailleur
1f6d0ab3ef
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/product/class/product.class.php
2013-08-27 09:36:54 +02:00
Florian Henry
2dce07590c
Fix: If only service module is activated, it's impossible to delete
...
service
2013-08-26 14:39:35 +02:00
Laurent Destailleur
4eb37abed9
New: Translate the email to change password.
2013-08-25 06:53:59 +02:00
simnandez
fd759ade76
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:04:10 +02:00
simnandez
c242d66530
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:03:16 +02:00
Christophe Battarel
10ced7431e
update changelog
2013-08-23 09:16:48 +02:00
Juanjo Menent
7e61c3703a
Merge pull request #1189 from altairis-fr/3.4
...
fix display of buying price on line edit when no supplier price is defined
2013-08-23 00:15:00 -07:00
Florian Henry
aeb072b1eb
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-23 09:02:50 +02:00
Florian Henry
4f991da846
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-22 15:11:11 +02:00
Christophe Battarel
e00f02616d
update changelog
2013-08-22 10:49:13 +02:00
Laurent Destailleur
52d39915d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-21 22:21:33 +02:00
simnandez
dfe2b7ec4d
Fix UserGroup name not display in card view or edit
2013-08-21 18:47:51 +02:00
Florian Henry
71ec4ea31c
Merge remote-tracking branch 'origin/3.4' into 3.4
...
Conflicts:
ChangeLog
Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
2013-08-21 17:32:52 +02:00
Florian Henry
ba4fde20ce
Fix UserGroup name not display in card view or edit
2013-08-21 17:03:13 +02:00
Laurent Destailleur
c4bc10b8eb
Qual: Clean code by moving synchro with mailman into mailman trigger
...
New: A trigger can return an array of error strings instead of one error
string.
2013-08-21 12:39:20 +02:00
simnandez
1f05800909
Fix: [ bug #1037 ] Consumption> Supplier invoices related
2013-08-21 12:08:43 +02:00
simnandez
4e34e7b71c
Fix: [ bug #1037 ] Consumption> Supplier invoices related
2013-08-21 12:06:02 +02:00
Christophe Battarel
8128ed0556
define user permissions on margin module
...
update changelog
2013-08-20 12:00:16 +02:00
Florian Henry
472d218372
Add category into filter into webservice thirdparty method
...
getListOfThirdParties
2013-08-15 10:39:59 +02:00
simnandez
31ad0e656f
Update ChangeLog
2013-08-14 09:57:57 +02:00
Florian Henry
60b3f61339
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
2013-08-13 12:13:47 +02:00
Florian Henry
5fcbd2d14f
Fix Bug with canvas
2013-08-12 19:44:30 +02:00
simnandez
5cbfa61731
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:42:01 +02:00
Florian Henry
26d1352de4
Fix update extrafield do not display immediatly
2013-08-12 14:30:42 +02:00
Laurent Destailleur
5841edd40f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-10 02:40:29 +02:00
Laurent Destailleur
8e5537f1ce
New: Add trigger CATEGORY_LINK and CATEGORY_UNLINK.
2013-08-10 02:40:11 +02:00
Florian Henry
0a8c7f7639
Generate auto supplier invoice
2013-08-09 13:59:37 +02:00
Florian Henry
3cf3dbeb51
Add pdf link into supplier invoice list and supplier order list
2013-08-09 13:48:44 +02:00
Florian Henry
75701ee995
Fix: Supplier invoice and supplier order are not displayed into object
...
link into agenda event card
2013-08-09 13:11:18 +02:00
simnandez
6b1484c2ea
Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count
2013-08-08 17:11:54 +02:00
simnandez
6d4fa94bf1
Update ChangeLog
2013-08-08 10:06:45 +02:00
simnandez
b9e1a57f67
Fix: [ bug #1029 ] Tulip numbering mask
2013-08-08 10:00:06 +02:00
simnandez
ebd75449dc
Update ChangeLog with finished task
2013-08-05 17:36:07 +02:00
Laurent Destailleur
aab1a6d958
New: Add hook addHomeSetup
2013-08-05 10:10:44 +02:00
Laurent Destailleur
3dd1841ab6
New: Add language code files for South Africa.
2013-08-03 02:02:25 +02:00
simnandez
283d9eb064
Text for invoices numbering modules more clear. Update ChangeLog
2013-08-02 15:27:37 +02:00
Laurent Destailleur
4f464eb226
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/modules/export/export_excel2007.modules.php
htdocs/langs/en_US/errors.lang
htdocs/langs/fr_FR/agenda.lang
htdocs/langs/fr_FR/errors.lang
2013-08-01 17:42:18 +02:00
Laurent Destailleur
e9df22dcc0
Fix: restore lost info into changelog.
...
Add note of todo for next versions.
2013-08-01 04:28:12 +02:00
Florian Henry
c5cec980c8
Fix spelling
2013-07-31 21:55:32 +02:00
Florian Henry
325ceda4dc
[ task #1014 ] Add option to recursivly add parent cactegory
2013-07-31 21:52:49 +02:00
Laurent Destailleur
37592afa7e
New: Add hidden option BANK_DISABLE_DIRECT_INPUT
2013-07-31 18:40:09 +02:00
Laurent Destailleur
e234d5342d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Laurent Destailleur
f765288f12
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2013-07-31 12:38:15 +02:00
simnandez
5e2bfea879
Update ChangeLog with task 1011
2013-07-30 17:14:38 +02:00
Laurent Destailleur
87713c49ac
New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with
...
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
2013-07-29 19:12:04 +02:00
Laurent Destailleur
00f39f9bfd
Fix: tons of bugs into css.
...
Qual: Remove table for login informations.
Fix: Restore compatibility with IE 8+.
2013-07-28 17:02:13 +02:00
Laurent Destailleur
444a3328c6
New: More options to select status of users into select user list.
2013-07-27 14:45:55 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
83e2f0dc48
Merge remote-tracking branch 'origin/3.3' into 3.4
...
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/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
2013-07-27 12:40:59 +02:00
Laurent Destailleur
a43e7fd34e
Fix: Changelog
2013-07-27 12:39:01 +02:00
Florian Henry
7af45ccdf3
update changelog
2013-07-26 12:52:51 +02:00
simnandez
7efacecb08
New: [ task #1005 ] Adapting to Spanish legislation bill numbering
2013-07-26 12:46:34 +02:00
Geoffrey
27e26c872e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
ChangeLog
2013-07-19 17:33:29 +02:00
Maxime Kohlhaas
bef913cc2f
Update changelog
2013-07-19 17:28:46 +02:00
Laurent Destailleur
9e283f98e8
Fix: removed deprecated nowrap tag
...
Add changelog entry
2013-07-19 15:58:07 +02:00
Laurent Destailleur
ed52dd9636
New: A more responsive desgin for statistic box of home page
...
Qual: Hook for statistics now match specifications.
2013-07-19 15:29:40 +02:00
simnandez
497759d7ef
Update ChangeLog
2013-07-18 17:31:34 +02:00
Florian Henry
93810cbb8d
MErge Devellop and update changelog
2013-07-18 10:58:08 +02:00
Florian Henry
2c8c3857ba
Update change Log
2013-07-18 10:25:50 +02:00
Laurent Destailleur
f564d1912e
New: Add graph for supplier invoices.
...
Fix: Error management into supplier invoice validation.
2013-07-16 18:43:38 +02:00
Laurent Destailleur
28c28bd217
New: Add option excludethirdparties and onlythirdparties into merge pdf
...
scripts.
2013-07-15 20:56:43 +02:00
Laurent Destailleur
6a1446f4dd
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-14 16:35:02 +02:00
Laurent Destailleur
2c0a01fc8c
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-11 17:57:06 +02:00
Laurent Destailleur
27a435994a
Qual: Some methods object->addline used a first parameter that was
...
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
a4abfe1abc
New: Can add an event automatically when a projet is create.
2013-07-10 14:46:16 +02:00
Laurent Destailleur
f67e52f42a
Start to clean hook code
2013-07-09 21:40:45 +02:00
Florian Henry
95606dde04
Just update space into change log
2013-07-08 14:54:55 +02:00
Florian Henry
3db195cb48
[ bug #971 ] html.form.class.php select_contact with autocomplete do not
...
exclude id from exclude array
2013-07-08 12:51:17 +02:00
Florian Henry
b1b68eafe3
[ bug #972 ] Auto completion contact field do not take account the min
...
caract number before search
2013-07-08 12:47:07 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Laurent Destailleur
eef039e02f
New: [ task #286 ] Enhance rounding function of prices to allow round of
...
sum instead of sum of rounding
2013-07-04 00:11:40 +02:00
Laurent Destailleur
33ed654745
New: Upgrade jquery flot library to 0.8.1
2013-07-03 03:40:59 +02:00
Laurent Destailleur
6f5a918373
New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page.
...
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
2013-07-02 21:53:34 +02:00
Laurent Destailleur
d8883dba7f
New: Add new graphical boxes (customer invoices per month).
2013-06-28 19:19:18 +02:00
Laurent Destailleur
af4651f1a2
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/perl/virtualmin/dolibarr.pl
htdocs/core/lib/files.lib.php
htdocs/langs/en_US/projects.lang
htdocs/langs/fr_FR/projects.lang
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/webservices/server_other.php
2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/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/class/facture-rec.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
2013-06-25 21:31:24 +02:00
Laurent Destailleur
92306ca242
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-25 14:10:07 +02:00
Laurent Destailleur
2d0a85d6f8
New: Add option to send email when paypal or paybox payment is done.
2013-06-25 13:19:44 +02:00
simnandez
ca190be382
[Bug #958 ] LocalTax2 for Spain fails on Suppliers
2013-06-25 11:21:56 +02:00
simnandez
065b30f0d0
[Bug #958 ] LocalTax2 for Spain fails on Suppliers
2013-06-25 11:12:21 +02:00
Laurent Destailleur
a8547b5375
New: Add property hidden into module descriptor to allow to hide a
...
module according to some dynamic conditions.
2013-06-24 18:31:56 +02:00
Laurent Destailleur
ec2e3db450
New: Switch cron module to status stable. Thanks to everybody to test
...
this new module and debug it.
2013-06-23 22:21:21 +02:00
Marcos García
676191c1f9
Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
2013-06-19 10:22:46 +02:00
Laurent Destailleur
02f1271fc4
New: Add option ADHERENT_LOGIN_NOT_REQUIRED
2013-06-14 01:30:43 +02:00
Florian Henry
fb0a99cb55
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:05:19 +02:00
Marcos García
13bcb5daaa
Merge branch 'develop' into clone-composition
...
Conflicts:
ChangeLog
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-06-12 16:39:23 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Marcos García
e727100cf0
New: Clone product/service composition
2013-06-10 00:11:25 +02:00
Laurent Destailleur
89ee79f5cf
New: Implement same rule for return value of all command line scripts (0
...
when success, <>0 if error).
2013-06-09 14:40:33 +02:00
Laurent Destailleur
e1f922b37b
Update changelog
2013-06-09 12:49:05 +02:00
Laurent Destailleur
5a77828e62
New: Add object_hour as substitution tag for opendocument generation.
2013-06-08 18:12:32 +02:00
Laurent Destailleur
c3f5e0c6ee
New: Show version of client lib used by mysql drivers
2013-06-07 19:19:11 +02:00
Laurent Destailleur
35fbc9b066
- New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO.
2013-06-07 12:43:41 +02:00
Laurent Destailleur
81d6d5d51f
Doc
2013-06-05 22:28:55 +02:00
Laurent Destailleur
eac4aa7e28
New: Module mailman can subscribe/unsubscribe to ML according to
...
categories of member.
2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/infobox.class.php
2013-06-04 22:59:28 +02:00
Laurent Destailleur
6cf1d25529
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2013-06-03 11:09:40 +02:00
Marcos García
8ae0939ae5
Fixed bug #903 : Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
2013-06-01 15:39:45 +02:00
Laurent Destailleur
5bba5782a4
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-29 21:22:27 +02:00
Laurent Destailleur
1cb33c43bd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Christophe Battarel
5de7f77a09
update ChaneLog
2013-05-23 23:09:32 +02:00
Laurent Destailleur
e9df560b74
New: Show process id in all command line scripts
2013-05-22 12:23:42 +02:00
Laurent Destailleur
12681994ea
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/fichinter/class/fichinter.class.php
htdocs/fichinter/fiche.php
2013-05-20 21:21:03 +02:00
Laurent Destailleur
71e14df62f
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-05-20 17:37:08 +02:00
Christophe Battarel
fea0e6de54
Fix - external users should not see costprice and margin infos
2013-05-19 14:06:51 +02:00
fhenry
cbf29e20a2
[ task #901 ] Add Extrafeild on Fiche Inter
2013-05-18 13:00:36 +02:00
fhenry
fefb21a56e
Fix bug on Extrafield checkbox
...
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
fhenry
faa2399b80
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
2013-05-17 09:49:06 +02:00
Laurent Destailleur
fb92e13650
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
scripts/invoices/email_unpaid_invoices_to_customers.php
scripts/invoices/email_unpaid_invoices_to_representatives.php
2013-05-15 22:35:41 +02:00
Laurent Destailleur
49735b8d39
New: Add option "filter=bank" onto script rebuild_merge_pdf.php to
...
merge PDF that has one payment on a specific bank account.
2013-05-15 17:52:56 +02:00
Laurent Destailleur
e95db78d50
New: Add script export-bank-receipts.
2013-05-15 13:41:31 +02:00
Laurent Destailleur
79d2dea26a
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/langs/en_US/errors.lang
htdocs/langs/fr_FR/errors.lang
2013-05-14 03:04:42 +02:00
Laurent Destailleur
55c8522988
Update changelog
2013-05-14 01:34:24 +02:00
simnandez
83ffaecc40
Update ChangeLog
2013-05-13 17:37:56 +02:00
simnandez
0c853b3ebd
Fix: Some bugs on withdrawal rejects
2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee
Fix: Some bugs on withdrawal rejects
2013-05-13 17:15:23 +02:00
fhenry
760ae88f39
[ task #531 ] Add a duration on tasks
2013-05-13 17:08:36 +02:00
fhenry
7728043122
Changelog update
2013-05-12 11:46:30 +02:00
Marcos García
c21390ab83
New: [ task #858 ] Holiday module: note on manual holiday assignation
2013-05-04 20:08:17 +02:00
simnandez
15ede98fe7
New: [ task #877 ] Reorganize menus. Init works
...
Add migration script 3.4 to 3.5
2013-05-04 01:22:09 +02:00
Laurent Destailleur
7382a97223
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2013-05-03 10:13:31 +02:00
Marcos García
c65620ab62
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866
...
Conflicts:
ChangeLog
2013-05-03 08:17:58 +02:00
Laurent Destailleur
fc0d5abd14
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
fhenry
7e47b37ade
Fix [ bug #788 ] Date of linked interventions are not shown
2013-05-02 13:56:14 +02:00
Marcos García
a9e63610ae
Fixed bug #866 : Standing order from an invoice suggests invoice total amount instead of remaining to pay
2013-05-01 20:40:29 +02:00
fhenry
3933fb318c
update change log
2013-04-30 21:57:34 +02:00
fhenry
e9f02ebacf
Update change log
2013-04-30 21:45:40 +02:00
simnandez
8a266058c1
Removed duplicated changelog entries and ordered fixes by bug ID
2013-04-30 12:05:21 +02:00
Marcos García
947bda1af8
Removed duplicated entries and ordered fixes by bug ID
2013-04-29 21:37:25 +02:00
simnandez
52b9a3ad91
Update ChangeLog
2013-04-29 12:49:56 +02:00
simnandez
00adb1b9ab
Fix: [ bug #855 ] Holiday approval email in French
2013-04-29 12:46:07 +02:00
Marcos García
54fc731df7
Fix: [bug #856 ] Mail error if destination user doesn't have an email
2013-04-28 01:58:57 +02:00
Laurent Destailleur
80e470a4ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
Marcos García
1065645fb6
Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
2013-04-27 13:45:25 +02:00
Laurent Destailleur
ed4c18b9d3
Update changelog.
...
Fix: Fix template ODS.
2013-04-22 13:15:33 +02:00
Laurent Destailleur
89ad634230
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/hookmanager.class.php
htdocs/langs/fr_FR/holiday.lang
2013-04-22 01:39:49 +02:00
Marcos García
82e3a8d0b9
New: [ task #823 ] Shipping_validate email notification
2013-04-21 14:14:30 +02:00
simnandez
7b0c7c1a55
Update ChangeLog
2013-04-20 22:42:06 +02:00
Laurent Destailleur
162ccf68b6
Merge pull request #841 from FHenry/develop
...
fix [ bug #825 ] User first name not visible into users->perms
2013-04-19 17:21:16 -07:00
Marcos García
458b1cdf60
Improved dictionary translations + minor bug fix
2013-04-19 23:33:54 +02:00
Marcos García
becd40a825
Fixed bug #828 : Error when code_region is not a number in llx_c_regions (with postgres)
2013-04-19 15:38:24 +02:00
fhenry
c0c1de7992
[ task #826 ] Increasing stock when deleting an invoice
2013-04-18 08:40:29 +02:00
Laurent Destailleur
29b3973611
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-17 23:17:21 +02:00
Laurent Destailleur
ff2adc40a4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/admin/dict.php
htdocs/comm/prospect/fiche.php
2013-04-17 23:15:57 +02:00
fhenry
4927aae891
[ task #741 ] Gestion des interventions/Add intervention box
2013-04-17 16:20:01 +02:00
fhenry
03e57c229a
Update changelog
2013-04-17 10:00:12 +02:00
fhenry
2b05cb3cea
Update changelog
2013-04-17 09:52:30 +02:00
fhenry
2bac3982ba
Update Changelog
2013-04-17 09:48:44 +02:00
fhenry
e7cec6d410
update change log
2013-04-17 09:32:35 +02:00
simnandez
e0ec88a286
Update ChangeLog
...
Conflicts:
ChangeLog
2013-04-16 09:03:38 +02:00
simnandez
90a2a86dbb
Update ChangeLog
2013-04-16 08:59:01 +02:00
simnandez
76132206bf
Fix: Bad link to all proposals into Third party card if customer is
...
prospect
2013-04-15 17:12:31 +02:00
Marcos García
462719331e
Updated changelog
2013-04-15 09:13:00 +02:00
Marcos García
0e34df43b1
Updated changelog
2013-04-14 13:09:00 +02:00
Laurent Destailleur
baad1ffc56
New: Add link to autofill/reset with quantity to ship when creating
...
a delivery receipt.
2013-04-14 12:19:21 +02:00
Laurent Destailleur
e5a945ba5b
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/admin/propal.php
htdocs/compta/journal/purchasesjournal.php
htdocs/compta/journal/sellsjournal.php
htdocs/core/class/conf.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/core/modules/mailings/contacts2.modules.php
htdocs/langs/ca_ES/admin.lang
htdocs/langs/en_US/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
bda39f25bf
New: Default aprrover for holidays i sby default hierchical parent.
2013-04-14 01:04:11 +02:00
Marcos García
486425d258
Merge branch '3.3' into bug-817
...
Conflicts:
ChangeLog
2013-04-13 23:58:05 +02:00
Marcos García
b3a035951f
[ bug #817 ] Purchases journal does not reflect localtaxes
2013-04-13 15:22:59 +02:00
Marcos García
3ed4d7bfbf
Updated changelog
2013-04-13 14:46:43 +02:00
simnandez
e209959c90
Fix: Remove ChangeLog duplicity
2013-04-11 17:58:56 +02:00
Laurent Destailleur
aeae723108
New: Event into calendar use different colors for different users.
2013-04-11 10:15:53 +02:00
Laurent Destailleur
538194f435
New: Add module opensurvey. Final. Test are welcome.
2013-04-09 23:05:50 +02:00
Marcos García
303cf3bc41
Updated changelog
2013-04-07 22:01:33 +02:00
simnandez
bde030dfae
Spelling fix
2013-04-07 16:08:11 +02:00
simnandez
8f67606685
Spelling fix
2013-04-07 16:04:57 +02:00
simnandez
482d30ca1d
Update ChangeLog
2013-04-07 15:40:54 +02:00
simnandez
35279f6520
Update ChangeLog
2013-04-07 15:17:31 +02:00
simnandez
515c5e58ca
Update Changelog
2013-04-07 15:04:55 +02:00
simnandez
7b70fc4bf3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-04-07 14:30:44 +02:00
Laurent Destailleur
88858136fc
New: Enhance agenda module to reach RFC2445 (add busy information).
2013-04-06 17:39:31 +02:00
simnandez
ec7a6433f6
Update Changelog
2013-04-06 08:56:47 +02:00
Laurent Destailleur
1cf2276584
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/prospect/list.php
2013-04-05 22:59:06 +02:00
Simnandez
992ec308d2
Update Changelog
2013-04-04 16:54:41 +02:00
Laurent Destailleur
545ac638b0
Qual: Removed deprecated code for using a specific mobile theme.
...
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
2013-04-03 15:20:56 +02:00
Laurent Destailleur
954af0f6c7
New: Add option INVOICE_CAN_NEVER_BE_REMOVED
2013-04-01 22:17:51 +02:00
Laurent Destailleur
cc69cf7b76
New: Can defined a clicktodial setup per user
2013-03-31 16:44:24 +02:00
Laurent Destailleur
fbf8d410d2
New: Support revenue stamp onto invoices
2013-03-23 17:34:23 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
aa021ac00c
Doc
2013-03-13 11:16:03 +01:00
Laurent Destailleur
5149ea9f51
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-13 11:10:51 +01:00
Laurent Destailleur
60930d9e74
New: Enhance Dolibarr migration process to include migration script of
...
external modules.
2013-03-13 11:06:28 +01:00
simnandez
6ce82bc723
Update ChangeLog
2013-03-12 16:55:21 +01:00
Laurent Destailleur
fc3483a4bb
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/webservices/server_user.php
2013-03-12 14:55:13 +01:00
simnandez
5c4b537a65
Fix: [ bug #762 ] Bad profit calculation in Reporting
2013-03-12 11:49:15 +01:00
Laurent Destailleur
5d38b69a70
New: Script email_unpaid_invoices_to_representative accepts now a
...
parameter test and a delay.
2013-03-11 17:43:03 +01:00
simnandez
57dadb4cb0
Update Changelog
2013-03-11 09:03:16 +01:00
Laurent Destailleur
7bbbc32af9
Fix: Missing style and typo error
2013-03-09 17:08:19 +01:00
Laurent Destailleur
2c95b55682
Fix: Rename of fields
2013-03-09 16:37:50 +01:00
Laurent Destailleur
2a67af3c94
New: when adding an action, we can define a free code to tag it for
...
a specific need.
2013-03-08 12:04:01 +01:00
Laurent Destailleur
47ec826c17
New: Add link to check professional id for india.
2013-03-07 10:47:05 +01:00
eldy
6c2841d4d6
New: Type of fields are received by export format handlers
2013-03-06 22:28:15 +01:00
Laurent Destailleur
baf6ccf654
New: Can define of we want to use VAT or not for subscriptions
...
(foundation module).
New: Can define a default choice for choice "More action when
recording a subscription" (foundation module).
2013-03-06 17:16:26 +01:00
Laurent Destailleur
451c9cab7e
Merge remote-tracking branch 'origin/3.3' into develop
...
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/comm/prospect/fiche.php
htdocs/filefunc.inc.php
htdocs/fourn/commande/fiche.php
2013-03-04 00:16:41 +01:00
Laurent Destailleur
e51c72f1e8
Merge
2013-03-04 00:10:09 +01:00
Laurent Destailleur
51d23d7c48
Merge fix of 3.3
2013-03-02 16:17:12 +01:00
simnandez
b16b8f9ff3
Update ChangeLog for 3.3.1
2013-03-01 22:13:38 +01:00
simnandez
b2763bab15
Fix: Localtax2 for Spain must be based into buyer
2013-03-01 20:38:08 +01:00
Laurent Destailleur
7bbbda2dce
New: dol_syslog method accept a suffix to use different log files for
...
log.
2013-02-28 16:19:16 +01:00
Laurent Destailleur
43a248b88b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-02-25 13:01:56 +01:00
Laurent Destailleur
2dc4b91521
New: Function plimit of databases drivers accept -1 as value (it means
...
default value set into conf->liste_limit).
2013-02-25 12:51:38 +01:00
Laurent Destailleur
234e171e9d
New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page.
2013-02-24 18:16:26 +01:00
Laurent Destailleur
c4c5e247af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-22 09:44:17 +01:00
Laurent Destailleur
a17b6c6d0d
Doc
2013-02-22 09:44:05 +01:00
simnandez
4cb6072f03
New: [ task #707 ] Create option ProfIdx are mandatory to validate a
...
invoice
2013-02-21 11:03:14 +01:00
Laurent Destailleur
2852aded3a
New: Add button collapse/expand for menu, category and user views.
2013-02-20 21:16:31 +01:00
simnandez
727c57377c
New: Add ES formated address country rule
2013-02-20 17:37:01 +01:00
Laurent Destailleur
da7b5e352f
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
New: Add function dol_set_focus('#xxx')
2013-02-18 15:01:00 +01:00
Laurent Destailleur
660fd2e785
Doc
2013-02-17 18:46:46 +01:00
Laurent Destailleur
b1ee14ce60
New: Can define a hierarchical responsible on users.
2013-02-15 18:39:27 +01:00
Laurent Destailleur
7d1c51ab77
Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
2013-02-13 16:45:53 +01:00
Laurent Destailleur
c2d334624b
Qual: Simplify system for menu manager. Only one file, one class per
...
manager.
2013-01-25 17:44:23 +01:00
Laurent Destailleur
f650888ea6
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-18 12:17:21 +01:00
Laurent Destailleur
57a869683d
Fix date function
2013-01-18 11:28:06 +01:00
Laurent Destailleur
66921cf24a
Prepare 3.4
2013-01-17 13:19:17 +01:00
Laurent Destailleur
f97f34a302
Update doc
2013-01-16 16:28:36 +01:00
Marcos García
acd4e8f747
Updated changelog with renamed ODT tag
2013-01-10 13:51:52 +01:00
Laurent Destailleur
c282f33d4d
Update changelog
2013-01-09 14:39:50 +01:00
Laurent Destailleur
5aeec9eab2
Fix: line into theme
2013-01-08 16:46:06 +01:00
Marcos García
0e21a61eca
Updated change log
2013-01-07 01:26:33 +01:00
Laurent Destailleur
049a6dc742
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2012-12-31 14:00:38 +01:00
Laurent Destailleur
53ee487358
Fix: Use standard syntax for version
2012-12-31 13:40:35 +01:00
Marcos García
406ce9e11c
Update changelog + update deprecated triggers in database
2012-12-31 04:11:13 +01:00
Marcos García
10fff57b51
Let's call them just triggers
2012-12-30 02:48:08 +01:00
Marcos García
99bf09dc9e
Updated changelog + also removed unused triggers when migrating from 3.2.x
2012-12-29 18:28:24 +01:00
simnandez
c04518e592
Fix: Add ChangeLog for 3.2.3 compared to 3.2.2
2012-12-21 10:25:37 +01:00
Laurent Destailleur
77ca4241a5
New: Can input a payment back onto an credit note.
2012-12-09 18:39:42 +01:00
Maxime Kohlhaas
4cffe3e5a3
Fix : minor html fix + changelog
2012-12-07 11:06:51 +01:00
Laurent Destailleur
3858085a7f
Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help"
...
onto logon page.
2012-12-06 17:59:37 +01:00
Christophe Battarel
4560c2e9d7
update changeLog with latest new functionnalities
2012-12-05 23:20:34 +01:00
simnandez
c365dbc679
New: [ task #314 ] Can define if prof id are mandatory or not
2012-12-01 15:47:39 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
simnandez
b4e16827dc
New: [ task #314 ] Can define if prof id are mandatory or not
2012-11-30 21:23:12 +01:00
Laurent Destailleur
008f5fbcfc
New: extrafields are available onto users cards.
2012-11-30 15:55:59 +01:00
Laurent Destailleur
e76ef823b8
New: Add a tab into members statistics to count members by nature.
2012-11-21 23:01:36 +01:00
Laurent Destailleur
1f263943c5
New: Add option to add slashes lines between lines into PDF.
2012-11-21 19:07:03 +01:00
Laurent Destailleur
6512fd90a9
New: Can export customer shipments.
2012-11-18 15:24:01 +01:00
Laurent Destailleur
8896803921
New: We can use a dynamic value ($conf->global->XXX for example) into
...
titles of menus.
New: Can choose menu entry to show with external site module.
2012-11-04 21:19:12 +01:00
Laurent Destailleur
f6d9b2abe3
New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT,
...
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
2012-10-31 13:48:59 +01:00
Laurent Destailleur
1d7820c5ac
New: English bank account need a bank code (called sort code) to
...
identify an account.
2012-10-31 00:22:13 +01:00
simnandez
3f81fcaf37
New: More import options. ChangeLog
2012-10-29 18:19:37 +01:00
Marcos García
c9944a6b9b
Created function to retrieve total discounted amount of a commonobject
...
Also added an ODT tag to let people add it to their invoices, etc..
2012-10-15 00:49:39 +02:00
Laurent Destailleur
4a3ade6264
Update doc
2012-10-13 18:09:00 +02:00
Laurent Destailleur
566855d7e8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2012-10-06 23:15:10 +02:00
Laurent Destailleur
053b4dd63c
New: [ task #210 ] Can choose cash account during POS login
2012-10-06 21:47:59 +02:00
Maxime Kohlhaas
5aa9a8e41d
Add changelog entries
2012-10-06 13:53:37 +02:00
Regis Houssin
6b21ca442d
New: add possibility to defined position/job of a user
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-10-05 12:40:19 +02:00
Laurent Destailleur
0f78ffda5c
New: POS module can works with only one payment method (cach, chq,
...
credit card).
2012-10-03 14:45:58 +02:00
Laurent Destailleur
c69e1af7db
Update changelog
2012-10-03 11:54:23 +02:00
Laurent Destailleur
5c4a31369d
Update changelog
2012-09-22 20:29:17 +02:00
Laurent Destailleur
3953be53a7
Qual: Mutualize code
...
New: Can use extrafields on contacts/addresses.
2012-09-17 01:39:30 +02:00
Laurent Destailleur
d48f294531
New: [ task #289 ] Reorder tasks
2012-09-15 15:33:00 +02:00
Laurent Destailleur
4cc56f0176
New: Extra fields supports more types (now int, string, double, date,
...
datetime)
2012-09-13 10:14:25 +02:00
Marcos García
aa9ef31f9d
Added Changelog
2012-09-12 14:51:21 +02:00