Laurent Destailleur
57c84089fe
Introduce warning to remind to do a backup before migration.
...
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
Laurent Destailleur
568d5cb5ba
Fixed: Tracking number restored on PDF shipments
...
Fixed: Translation
Conflicts:
htdocs/langs/en_US/agenda.lang
2015-01-23 18:47:47 +01:00
Laurent Destailleur
083cf06908
Fixed: Tracking number restored on PDF shipments
...
Fixed: Translation
2015-01-23 18:33:33 +01:00
Laurent Destailleur
017a483eb3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-21 00:06:03 +01:00
Laurent Destailleur
449f2b9346
Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr
...
into marcosgdf-delay-emailing
Conflicts:
htdocs/comm/mailing/card.php
2015-01-21 00:05:19 +01:00
Florian HENRY
ab50437331
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/html.form.class.php
2015-01-19 09:38:00 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
c667f8734a
[ task #1793 ] Create new permission to restrict commercial agent margin to logged user
2015-01-18 16:42:11 +01:00
Marcos García de La Fuente
fb186d6ef8
Added delay between mails in Newsletter module
2015-01-18 16:26:26 +01:00
Florian HENRY
22c253cfc1
add extrafield type, check box from table
2015-01-18 16:02:31 +01:00
Laurent Destailleur
34fe87536b
Merge pull request #2137 from frederic34/printipp
...
Printing System which may accept modules
2015-01-18 13:09:41 +01:00
Florian HENRY
b407716175
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-18 11:57:32 +01:00
Laurent Destailleur
eeeb6de8d9
Merge pull request #2020 from GPCsolutions/situationsinvoices
...
Situations invoices support
2015-01-17 14:44:05 +01:00
Laurent Destailleur
d1a0187f82
Merge pull request #2236 from marcosgdf/translations
...
Corrected translation typos
2015-01-16 12:10:32 +01:00
Laurent Destailleur
6a081fe883
Merge pull request #2229 from frederic34/getnextvalue
...
Translation error messages numbering modules
2015-01-16 12:08:53 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
362167f319
Fixed: Export was not using user assigned
2015-01-15 02:32:15 +01:00
Laurent Destailleur
ba49cce47a
Fix: The filter into event views on user must be done on assigned
...
resource, not only owner.
2015-01-15 02:06:04 +01:00
Laurent Destailleur
033e77c04a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/product.php
2015-01-13 15:41:45 +01:00
Marcos García de La Fuente
7b4cf976df
Corrected translation typos
2015-01-13 09:42:46 +01:00
Laurent Destailleur
dc0d12eccd
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-12 19:00:29 +01:00
Laurent Destailleur
58e4e01db7
Sync transifex
2015-01-12 18:59:46 +01:00
Laurent Destailleur
31fd03790e
Fixed: Prices visible into stock tab.
...
Conflicts:
htdocs/product/stock/product.php
2015-01-12 18:26:11 +01:00
Cedric
26cad2400e
Fix missing lang key
2015-01-12 13:18:50 +01:00
frederic34
173d3aaa90
Translation error messages numbering modules
2015-01-11 11:31:53 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
Laurent Destailleur
baeff1dcec
Merge pull request #2228 from frederic34/tooltip
...
Add some "classfortooltip"
2015-01-09 22:44:14 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
fentman
166bbeb8e9
Update en_AU separator from comma to full stop
...
Updating the en_AU Main Language - Decimal Separator from a Comma to a Full Stop
2015-01-08 11:27:32 +11:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Laurent Destailleur
48818ed2fd
Fixed: Quick solution to solve problem of unknown payment amount for
...
online subscription.
2015-01-04 15:40:01 +01:00
Drosis Nikos
a5572eb200
Fix Lang for cashdesk Check Payment Type
2015-01-02 18:15:14 +02:00
frederic34
e937039596
Merge remote branch 'upstream/develop' into printipp
2014-12-28 11:59:58 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
Laurent Destailleur
ade688b589
Merge pull request #2174 from marcosgdf/bug-1723
...
Fix [ bug #1723 ] Draft tasks?
2014-12-26 03:48:15 +01:00
Marcos García de La Fuente
09a094104c
Removed duplicated and unused translation key
2014-12-25 18:31:24 +01:00
Laurent Destailleur
bd7f6339ce
Because this is a legal issue (OPCA), i added the hidden constant for
...
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
2014-12-25 12:08:35 +01:00
Marcos García de La Fuente
743867b91b
Spanish translation
2014-12-23 15:57:30 +01:00
Marcos García de La Fuente
78307a748d
Corrected confusing table header in task list
2014-12-23 15:56:29 +01:00
Laurent Destailleur
9e2f57007b
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-12-23 12:59:54 +01:00
Laurent Destailleur
acf7b9f130
Because this is a legal issue (OPCA), i added the hidden constant for
...
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
2014-12-23 12:59:34 +01:00
Frédéric FRANCE
748bef6134
Translation error
2014-12-22 20:02:53 +01:00
frederic34
3bf63ed0a9
Merge remote branch 'upstream/develop' into printipp
2014-12-21 14:59:37 +01:00
Frédéric FRANCE
82d403c347
Update admin.lang
2014-12-21 10:39:54 +01:00
Laurent Destailleur
219cd0f855
Fixed: Translation
2014-12-20 15:52:50 +01:00
