lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,267 Commits 43 Branches 150 Tags 886 MiB
3d3fb17da3
Commit Graph

88267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Laurent Destailleur
91bf759242
Merge pull request #17117 from ptibogxiv/patch-423 
Fix order status label in comm index page
 2021-04-08 16:21:24 +02:00
ptibogxiv
bd88806982
Fix order status label in comm index page 2021-04-05 12:07:51 +02:00
Laurent Destailleur
a0e423f1b8
Merge pull request #17098 from youvious/12.0 
Clean llx_accounting_account_be.sql of all 'PRODUCT' and 'SERVICE'
 2021-04-04 01:21:46 +02:00
Youvious
5e9ce734a7 Clean llx_accounting_account_be.sql of all 'PRODUCT' and 'SERVICE' (pcg_subtype) 2021-04-03 15:14:33 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Laurent Destailleur
ddaaabfb7a
Merge pull request #17054 from aspangaro/12p13 
FIX: Accountancy - Import in general ledger
 2021-03-31 13:46:04 +02:00
Laurent Destailleur
521dec7792
Merge pull request #17018 from fmarcet/11.0 
FIX: Show Ref.Supplier in LinkToObjectBlock
 2021-03-31 13:44:53 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
eabe5ae616 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:54 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Laurent Destailleur
b9a91f92ea
Merge pull request #16984 from aspangaro/10p38 
FIX Search on date in accountancy
 2021-03-29 16:12:31 +02:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
Laurent Destailleur
30543bda71
Merge pull request #16947 from atm-john/11.0_fix_something_that_not_exist 
FIX : shhhhhh ! There is nothing here...
 2021-03-25 01:09:20 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +01:00
Laurent Destailleur
af593099df Clean string 2021-03-22 23:52:14 +01:00
Laurent Destailleur
d5865dbfcc
Merge pull request #16791 from Robin-Yann/12.0 
FIX: fix checkbox displayed according to module project setup parameters - work in progress
 2021-03-20 12:06:03 +01:00
Laurent Destailleur
2df54d5da7
Merge pull request #16858 from frederic34/patch-10 
fix nested comments for doxygen
 2021-03-20 11:25:01 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen 2021-03-20 09:02:29 +01:00
Robin
d89d0782c9 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 2021-03-19 11:15:24 +01:00
Robin
26dc897042 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 
htdocs/projet/card.php
 2021-03-19 11:12:49 +01:00
Robin
cb4c047aa3 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 
htdocs/projet/card.php
 2021-03-19 10:00:10 +01:00
Robin
d852816101 FIX: fix checkbox displayed according to module project setup parameters 2021-03-19 09:54:11 +01:00
Robin
b3757a6f69 FIX: fix checkbox displayed according to module project setup parameters - work in progress 2021-03-18 11:07:48 +01:00
Laurent Destailleur
a29a9e5435 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-16 15:14:46 +01:00
Laurent Destailleur
66bbc7f54f
Merge pull request #16734 from AlexisLaurier/11.0 
correct nb_expedition count
 2021-03-16 15:12:18 +01:00
Alexis LAURIER
971b97d78f correct nb_expedition count 2021-03-16 15:00:46 +01:00
Laurent Destailleur
b5edfdf6f6
Merge pull request #16687 from atm-florianm/fix/12.0_min_php_version_in_composer_json 
Fix/12.0 min php version in composer json
 2021-03-15 17:16:27 +01:00
Florian Mortgat
a5f6ee5889 Merge branch '12.0' of github.com:Dolibarr/dolibarr into fix/12.0_min_php_version_in_composer_json 2021-03-15 15:06:54 +01:00
Florian Mortgat
631aad94e7 FIX PHP version requirement in composer.json 2021-03-15 15:05:01 +01:00
Laurent Destailleur
d905d92434
Merge pull request #16637 from frederic34/patch-4 
force check if newref needed if project create fail
 2021-03-15 11:31:07 +01:00
Laurent Destailleur
fede7b7a15
Merge pull request #16633 from frederic34/patch-3 
fix number is already used doesn't propose new code with elephant
 2021-03-12 20:18:46 +01:00
Frédéric FRANCE
815a7683a2
force getnextref if project create fail 2021-03-12 16:48:43 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant 2021-03-12 13:14:53 +01:00
Laurent Destailleur
43836836e4
Merge pull request #16610 from atm-lena/12.0_FIX_Sociales_Create_KeepValues_Error 
FIX create sociales : keep values error form
 2021-03-10 15:30:06 +01:00
Laurent Destailleur
c209d9b45e
Update paiement_charge.php 2021-03-10 15:29:05 +01:00
atm-lena
b798535af9 FIX create sociales : keep values error form 2021-03-10 14:15:03 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation 
FIX : Add "Now" link on social charges creation card
 2021-03-08 16:31:41 +01:00
Laurent Destailleur
8b555d33e7
Merge pull request #16586 from atm-adrien/FIX/rouding_socialesCard_amount_on_card_updating 
FIX : Rounding amount on social charges card updating
 2021-03-08 16:30:53 +01:00
Laurent Destailleur
20c30bade8
Update card.php 2021-03-08 16:30:32 +01:00
Laurent Destailleur
5c7685c1b8
Merge pull request #16581 from frederic34/patch-7 
Do not return specimen if searching empty string value
 2021-03-08 16:29:04 +01:00
Adrien Raze
67c6577177 FIX : Add "Now" link on social charges card creation 2021-03-08 15:47:02 +01:00
Adrien Raze
cbb7751a15 FIX : rounding amount on card updating 2021-03-08 11:51:18 +01:00
Frédéric FRANCE
c0c9ac439f
Update api_agendaevents.class.php 2021-03-08 00:23:05 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0 
fix: set class attribute at right place
 2021-03-06 11:18:02 +01:00
Laurent Destailleur
1ad04bb67a
Merge pull request #16548 from frederic34/patch-5 
Fix #16544
 2021-03-06 11:09:58 +01:00
Laurent Destailleur
98c7814fa3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:37 +01:00