atm-florian.m
|
3e53a06b2e
|
minor spelling issues
|
2019-07-03 16:17:47 +02:00 |
|
Laurent Destailleur
|
6136dd6e7c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-27 13:57:08 +02:00 |
|
Laurent Destailleur
|
7f9b407c37
|
Sync transifex
|
2019-06-27 13:52:46 +02:00 |
|
Laurent Destailleur
|
84e4def180
|
Transifex sync
|
2019-06-27 13:39:54 +02:00 |
|
Laurent Destailleur
|
22b91f3693
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 13:28:44 +02:00 |
|
Laurent Destailleur
|
0f808114e5
|
Sync transifex
Fix CSS for Left To Right Languages
|
2019-06-22 13:18:33 +02:00 |
|
Frédéric FRANCE
|
a399e3f63d
|
Update companies.lang
|
2019-06-17 13:33:44 +02:00 |
|
ATM-Nicolas
|
d58603bd1e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column
|
2019-05-20 09:13:37 +02:00 |
|
ATM-Nicolas
|
6be48e6952
|
NEW : Amount HT invoiced column in propal list
|
2019-05-20 08:59:44 +02:00 |
|
Frédéric FRANCE
|
aef850f6d3
|
zapier for dolibarr
|
2019-05-19 21:12:22 +02:00 |
|
Laurent Destailleur
|
a5b1de4f6a
|
Fix tab that should not be visible
|
2019-05-09 17:52:55 +02:00 |
|
Laurent Destailleur
|
b8f2f957bf
|
Sync transifex
|
2019-05-09 16:58:31 +02:00 |
|
ATM-Nicolas
|
77d3f22163
|
NEW : Amount invoiced column in propal list
|
2019-05-07 14:39:16 +02:00 |
|
Laurent Destailleur
|
4899d03ff8
|
FIX Confusion between expired and late
|
2019-05-02 17:15:24 +02:00 |
|
Laurent Destailleur
|
a3782f7060
|
Transifex sync
|
2019-04-11 16:08:50 +02:00 |
|
Christophe Battarel
|
d0fcece613
|
dont make generic translations
|
2019-04-05 11:34:23 +02:00 |
|
Christophe Battarel
|
f167ad910e
|
camelCase and generic cloneCategories function
|
2019-04-05 11:30:51 +02:00 |
|
Laurent Destailleur
|
42fda54edf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
|
2019-04-02 19:41:58 +02:00 |
|
Laurent Destailleur
|
9b77cc4db8
|
Translation of currency
|
2019-04-02 19:33:14 +02:00 |
|
Laurent Destailleur
|
4b378a8d4b
|
Merge branch 'develop' into PaiementsModes
|
2019-03-26 19:45:39 +01:00 |
|
David Beniamine
|
f4e23ea427
|
Merge branch 'develop' into PaiementsModes
|
2019-03-24 21:34:33 +01:00 |
|
David Beniamine
|
b554ca2b73
|
Merge branch 'develop' into VATGrouped
|
2019-03-24 21:06:29 +01:00 |
|
David Beniamine
|
833da30af1
|
Use any dolibarr enabled paiement mode
|
2019-03-24 21:01:42 +01:00 |
|
David Beniamine
|
4b61f0d606
|
Grouped VAT
Add an option to group VAT by rate in receipt
|
2019-03-24 20:17:41 +01:00 |
|
David Beniamine
|
10ab6f480d
|
Automatically print receipt
|
2019-03-22 09:28:58 +01:00 |
|
Christophe Battarel
|
61f9aac887
|
begin factorization of categories cloning
|
2019-03-18 14:16:41 +01:00 |
|
Christophe Battarel
|
7bc0260661
|
begin factorization of categories cloning
|
2019-03-18 14:15:55 +01:00 |
|
Laurent Destailleur
|
8f65ee2296
|
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
|
2019-03-14 17:48:44 +01:00 |
|
Laurent Destailleur
|
7e31e6b4f6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/notify.class.php
|
2019-03-13 19:30:25 +01:00 |
|
Laurent Destailleur
|
c2063c5d0b
|
Fix bad translation
|
2019-03-12 18:24:55 +01:00 |
|
Christophe Battarel
|
3215e066e4
|
copy linked categories when cloning a product
|
2019-03-11 10:00:44 +01:00 |
|
atm-quentin
|
f51b89def3
|
NEW supplier buyprice barcode
|
2019-02-27 09:22:34 +01:00 |
|
Laurent Destailleur
|
3a2a1b4a56
|
Debug module ticket
|
2019-02-26 13:43:09 +01:00 |
|
ptibogxiv
|
091d2b9d68
|
FIX lang
|
2019-02-19 12:55:48 +01:00 |
|
Laurent Destailleur
|
9e28db4202
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export.php
|
2019-02-06 00:51:10 +01:00 |
|
Laurent Destailleur
|
7436a3bc73
|
Typo
|
2019-02-05 19:37:58 +01:00 |
|
Laurent Destailleur
|
66998c4873
|
Fix translation
|
2019-02-05 19:37:22 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
Laurent Destailleur
|
0a56069f67
|
Fix trans
|
2019-01-31 19:42:55 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Laurent Destailleur
|
f9686c47af
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/fr_FR/members.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/website/index.php
|
2019-01-23 19:22:42 +01:00 |
|
Laurent Destailleur
|
eefa57bf6b
|
Sync transifex
|
2019-01-22 18:15:47 +01:00 |
|
Laurent Destailleur
|
5c2b9e3078
|
NEW Introduce PhpSpreadsheet for export (need php5.6+)
|
2019-01-21 14:06:01 +01:00 |
|
ptibogxiv
|
796b19bc1b
|
Update members.lang
|
2019-01-17 22:40:34 +01:00 |
|
Laurent Destailleur
|
ab5aaa6b43
|
Start debug compta-files
|
2019-01-17 00:32:43 +01:00 |
|
Laurent Destailleur
|
126e02798a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
|
2019-01-07 19:49:15 +01:00 |
|
Laurent Destailleur
|
1188540b41
|
Sync transifex
|
2019-01-07 19:39:41 +01:00 |
|
andreubisquerra
|
8dee9de8f5
|
Add header and footer to TakePOS receipt
|
2018-12-30 22:20:55 +01:00 |
|
Laurent Destailleur
|
3d509910dd
|
Merge branch 'develop' into master
|
2018-12-22 18:24:23 +01:00 |
|
Laurent Destailleur
|
afee39ea68
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-21 12:09:27 +01:00 |
|
Laurent Destailleur
|
4859d944d8
|
Sync transifex
|
2018-12-21 12:09:03 +01:00 |
|
andreubisquerra
|
c4be1b141d
|
Temporary ticket improvement in TakePOS
|
2018-12-19 22:52:16 +01:00 |
|
Laurent Destailleur
|
27f8096afa
|
Merge branch 'develop' into PR_NEW_reception
|
2018-12-15 12:50:31 +01:00 |
|
Laurent Destailleur
|
ec3465e65f
|
Merge pull request #9995 from delcroip/develop
Add a link for compta-files.php in the accountancy leftmenue
|
2018-12-15 12:09:42 +01:00 |
|
Laurent Destailleur
|
0c3165a79a
|
Merge branch 'develop' into email-contact-card
|
2018-12-14 15:26:15 +01:00 |
|
Laurent Destailleur
|
9e83699193
|
Merge branch 'develop' into new_branch_31_10_2018
|
2018-12-14 14:27:35 +01:00 |
|
Laurent Destailleur
|
275eeca135
|
Trans
|
2018-12-04 13:09:58 +01:00 |
|
andreubisquerra
|
1009588592
|
TakeBOX now is 'TakePOS Connector'
|
2018-12-01 17:09:21 +01:00 |
|
Laurent Destailleur
|
0b6aaccfcc
|
sync transifex
|
2018-11-27 16:35:47 +01:00 |
|
Laurent Destailleur
|
e95c6091c4
|
Fix lang
|
2018-11-27 11:10:39 +01:00 |
|
Laurent Destailleur
|
0367795488
|
Fix auto jump on record if only 1 record in a search
|
2018-11-27 11:09:47 +01:00 |
|
Laurent Destailleur
|
7c22504252
|
Fix position of field must be ssame between create/edit/view
|
2018-11-27 09:22:59 +01:00 |
|
Laurent Destailleur
|
a3398f1a8d
|
Sync transifex
|
2018-11-19 15:49:58 +01:00 |
|
Laurent Destailleur
|
13d00b2eb1
|
Sync transifex
|
2018-11-17 23:14:12 +01:00 |
|
Laurent Destailleur
|
f32706259a
|
Sync transifex
|
2018-11-16 14:13:00 +01:00 |
|
patrick Delcroix
|
e9d3db084a
|
new: link to the compta-files.php in the accountancy left menu
|
2018-11-10 15:35:56 +01:00 |
|
François J
|
f9a8b240ac
|
Add PredefinedMailContentContact lang string
|
2018-11-06 15:05:03 +01:00 |
|
Laurent Destailleur
|
67fbb3dbb6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
|
2018-11-03 19:15:52 +01:00 |
|
Laurent Destailleur
|
c9ef298839
|
Fix setup template emails
|
2018-10-31 11:38:04 +01:00 |
|
Philippe GRAND
|
fe6b185bf1
|
Typo
|
2018-10-31 10:32:40 +01:00 |
|
atm-quentin
|
96d0bb8f2e
|
FIX adapt develop
|
2018-10-23 14:31:58 +02:00 |
|
atm-quentin
|
8442b405b2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
|
2018-10-23 10:27:46 +02:00 |
|
atm-quentin
|
0a033f4cfd
|
FIX : manage error
|
2018-10-22 16:49:36 +02:00 |
|
root
|
0c61162698
|
fix langs workflow reception
|
2018-10-22 14:56:13 +02:00 |
|
atm-quentin
|
cfba5a5e0f
|
fix when model mail selected
|
2018-10-18 17:02:20 +02:00 |
|
atm-quentin
|
236a61ab55
|
new manage correctly create bills on reception
|
2018-10-17 11:56:32 +02:00 |
|
atm-quentin
|
f11e1940fc
|
NEW mass action list reception create bills for validated reception
|
2018-10-16 12:05:28 +02:00 |
|
atm-quentin
|
83c8a78628
|
NEW auto event msg
|
2018-10-15 17:08:28 +02:00 |
|
Laurent Destailleur
|
31152e10f6
|
Trans
|
2018-10-13 13:27:59 +02:00 |
|
atm-quentin
|
83e4d6bd13
|
NEW export reception
|
2018-10-11 15:28:28 +02:00 |
|
atm-quentin
|
4b23b46e48
|
NEW workflow set reception billed on validate supplier bill
|
2018-10-11 14:49:19 +02:00 |
|
atm-quentin
|
489ccc3c49
|
NEW list and fix conf
|
2018-10-10 12:19:57 +02:00 |
|
Laurent Destailleur
|
3c8b365c3e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-10-09 14:53:39 +02:00 |
|
Laurent Destailleur
|
4d959bbea7
|
Fix consistency of label of proposal status
|
2018-10-09 14:06:45 +02:00 |
|
atm-quentin
|
9f56540e75
|
NEW actions buttons done with stock movement
|
2018-10-09 11:33:41 +02:00 |
|
Laurent Destailleur
|
923b561aff
|
FIX Option for prof id mandatory not working with custom type of company
|
2018-10-08 20:01:45 +02:00 |
|
atm-quentin
|
095d851e79
|
FIX affichage ligne reception
|
2018-10-08 12:15:17 +02:00 |
|
atm-quentin
|
6a8092dfae
|
NEW entete reception card
|
2018-10-05 16:21:50 +02:00 |
|
atm-quentin
|
5fe767d7bd
|
debut card create
|
2018-10-04 12:27:10 +02:00 |
|
atm-quentin
|
52717dbb65
|
NEW debut rename stock conf
|
2018-10-03 18:05:22 +02:00 |
|
atm-quentin
|
41d8cb87a3
|
debut reception setup page
|
2018-10-03 12:22:41 +02:00 |
|
atm-quentin
|
baed678b6e
|
NEW shipping set draft and update line
|
2018-10-02 15:49:31 +02:00 |
|
Laurent Destailleur
|
aaa5efc77e
|
Clean Take pos module
|
2018-09-28 22:06:04 +02:00 |
|
Laurent Destailleur
|
26d20d0b76
|
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
NEW Advanced permission to ignore price min
|
2018-09-27 09:57:49 +02:00 |
|
Laurent Destailleur
|
014da6c22c
|
Fix translation
|
2018-09-18 18:11:07 +02:00 |
|
Laurent Destailleur
|
1e36aba35f
|
Trans
Conflicts:
htdocs/langs/en_US/admin.lang
|
2018-09-17 16:42:44 +02:00 |
|
Laurent Destailleur
|
77d7c97750
|
Fix typo
|
2018-09-12 17:18:27 +02:00 |
|
Laurent Destailleur
|
e3339f5f95
|
Fix trad
|
2018-09-05 19:01:00 +02:00 |
|
Laurent Destailleur
|
bc31fa7fbf
|
Fix translation
|
2018-08-28 18:18:04 +02:00 |
|
Laurent Destailleur
|
bbc6255925
|
Fix missing language
|
2018-08-28 13:07:48 +02:00 |
|
Laurent Destailleur
|
37e16b5ff2
|
Trans
|
2018-07-16 11:55:59 +02:00 |
|
Laurent Destailleur
|
bd1e430a28
|
Synch transifex
|
2018-07-09 20:15:14 +02:00 |
|
Laurent Destailleur
|
7bf33b1bac
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
|
2018-07-02 12:16:51 +02:00 |
|
Laurent Destailleur
|
af21222c30
|
Fix translation
|
2018-07-02 11:47:04 +02:00 |
|
Laurent Destailleur
|
5c93fa1bfb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
|
2018-06-26 01:25:03 +02:00 |
|
Laurent Destailleur
|
52eddbf809
|
Sync transifex
|
2018-06-26 00:29:50 +02:00 |
|
Laurent Destailleur
|
5829014218
|
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
|
2018-06-24 10:24:26 +02:00 |
|
atm-quentin
|
d8ebb5da8d
|
FIX trans
|
2018-06-22 11:02:20 +02:00 |
|
Laurent Destailleur
|
ab5ed6a3b5
|
Fix rename of ticket language file
|
2018-06-11 09:31:31 +02:00 |
|
Laurent Destailleur
|
74890ce656
|
Sync transifex
|
2018-06-06 12:02:33 +02:00 |
|
Laurent Destailleur
|
87d073b5cd
|
Fix conflict with external ticketsup module
|
2018-06-04 21:49:29 +02:00 |
|
Laurent Destailleur
|
05c2f206ff
|
Fix missing lang
|
2018-05-21 19:35:12 +02:00 |
|
Abbes Bahfir
|
de8bd3f886
|
New : Translate accountancy journal menu entries
|
2018-05-07 08:43:41 +01:00 |
|
Abbes Bahfir
|
17b8de2cdd
|
New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED
|
2018-05-05 12:57:29 +01:00 |
|
atm-quentin
|
f70df3490f
|
FIX add db commit
|
2018-05-03 10:53:24 +02:00 |
|
atm-quentin
|
ec5e84075e
|
NEW Rights to ignore price min
|
2018-05-03 10:18:38 +02:00 |
|
Laurent Destailleur
|
9107701b8b
|
Move info into the README.md that is shown automatically.
|
2018-04-20 10:20:34 +02:00 |
|
Laurent Destailleur
|
9df179f48a
|
Clean lang file
|
2018-04-20 10:09:26 +02:00 |
|
Laurent Destailleur
|
eb3b351e83
|
Transifex sync
|
2018-04-17 16:17:07 +02:00 |
|
atm-quentin
|
ba5ac47602
|
NEW OnSearchAndListGoOnCustomerOrSupplierCard conf
|
2018-04-13 15:48:58 +02:00 |
|
Laurent Destailleur
|
b652c53379
|
Sync transifex
|
2018-04-11 13:26:23 +02:00 |
|
Laurent Destailleur
|
1c86eb1c44
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
|
2018-03-29 03:08:01 +02:00 |
|
Laurent Destailleur
|
460344fbfb
|
Traduction
|
2018-03-27 16:02:06 +02:00 |
|
Laurent Destailleur
|
a3851ec32a
|
Sync transifex
|
2018-03-27 12:23:39 +02:00 |
|
Laurent Destailleur
|
b44e791c0a
|
Work on vat reports
|
2018-03-26 21:39:18 +02:00 |
|
Laurent Destailleur
|
ab4f66009a
|
Translation
|
2018-03-24 00:00:35 +01:00 |
|
Laurent Destailleur
|
6e32e9961f
|
Syn transifex
|
2018-03-23 17:56:35 +01:00 |
|
Laurent Destailleur
|
67483eeb64
|
NEW Report a list of leave requests for a month
|
2018-03-20 13:42:29 +01:00 |
|
Laurent Destailleur
|
9997a6c787
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-03-16 12:20:42 +01:00 |
|
Laurent Destailleur
|
a94017ba25
|
FIX letter for month March
|
2018-03-16 00:07:00 +01:00 |
|
Laurent Destailleur
|
60283a8205
|
Remove file incoterm.lang
|
2018-03-13 18:07:58 +01:00 |
|
Frédéric FRANCE
|
27bf5419d6
|
Merge branch 'develop' into swifmailer
|
2018-03-09 22:44:57 +01:00 |
|
Laurent Destailleur
|
cf45f78d7e
|
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
|
2018-03-07 13:12:23 +01:00 |
|
Laurent Destailleur
|
fab007ad83
|
Remove deprecated option dolibarr_pdf_force_fpdf
Fix view of dolibarr setup config file
|
2018-03-07 09:41:27 +01:00 |
|
Laurent Destailleur
|
72af963ed5
|
Fix triggers
|
2018-03-06 12:26:26 +01:00 |
|
Laurent Destailleur
|
a086bd0137
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
|
2018-03-06 09:20:45 +01:00 |
|
Laurent Destailleur
|
a765dba570
|
Fix trad
|
2018-03-06 09:06:49 +01:00 |
|
KHELIFA
|
54dba24ab5
|
Add multicurrency support for product buy price for supplier propales, orders and invoices
|
2018-02-23 11:06:07 +01:00 |
|
Laurent Destailleur
|
6b74c79798
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/website.lang
|
2018-02-15 15:34:17 +01:00 |
|
Laurent Destailleur
|
0fc302fe98
|
Sync transifex
|
2018-02-15 00:06:43 +01:00 |
|
Laurent Destailleur
|
eccdc9a075
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
|
2018-02-08 15:20:24 +01:00 |
|
Laurent Destailleur
|
9a4de796e1
|
Merge pull request #8048 from ATM-Nicolas/add_margin_filters
NEW : Add margin filters
|
2018-02-08 15:15:30 +01:00 |
|
Laurent Destailleur
|
180f9918c7
|
Transifex sync
|
2018-02-05 20:43:50 +01:00 |
|
Frédéric FRANCE
|
0568461a7b
|
swiftmailer
|
2018-01-25 22:03:51 +01:00 |
|
atm-quentin
|
ce29331c05
|
NEW Filter export model by user
|
2018-01-18 12:34:22 +01:00 |
|
Laurent Destailleur
|
133e87fcc3
|
Sync transifex
|
2018-01-14 12:45:26 +01:00 |
|
ATM-Nicolas
|
30c6891b95
|
NEW : Add product categories filter on product margin
|
2018-01-10 11:17:23 +01:00 |
|
Laurent Destailleur
|
534cbcb941
|
Debug translation
|
2018-01-03 20:59:35 +01:00 |
|
Laurent Destailleur
|
6676178435
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
|
2017-12-28 09:56:40 +01:00 |
|
Laurent Destailleur
|
6a96a9765f
|
Transifex sync
|
2017-12-21 15:04:04 +01:00 |
|